Question about git In a repo I changed file positions I need

Question

Question about git In a repo I changed file positions I need

to import just some files from another branch which follows a remote repo,
how could I work in such a way that such commits gets merged into the renamed files?

0

08.06.2021

15 ответов

14 просмотров

Innocent Devil Автор вопроса

Déjà vu
first backup becaz my mind is not functioning prop...

Uhm what? What does this do I haven't anything to add

0

08.06.2021

Déjà vu

Innocent Devil
Uhm what? What does this do I haven't anything to ...

renamed stuffs must be added again

0

08.06.2021

Innocent Devil Автор вопроса

Déjà vu
renamed stuffs must be added again

I must revert them to their original position?

0

08.06.2021

Déjà vu

Déjà vu
renamed stuffs must be added again

otherwise next commit will remove them

0

08.06.2021

Déjà vu

Innocent Devil
I must revert them to their original position?

nah just add all

0

08.06.2021

Innocent Devil Автор вопроса

Déjà vu
nah just add all

Ok let's get this straight I have two branches One with my renamed files, already committed One that follows another repo with upstream stuff What do I do?

0

08.06.2021

cyberknight777 | OP7TP

cherry pick em?

0

08.06.2021

Innocent Devil Автор вопроса

cyberknight777 | OP7TP
cherry pick em?

By hand? Could be a solution, but they're really scattered

0

08.06.2021

Innocent Devil Автор вопроса

cyberknight777 | OP7TP
cherry pick em?

Also I should replicate them one by one on another file, seems really tiresome

0

08.06.2021

cyberknight777 | OP7TP

Innocent Devil
By hand? Could be a solution, but they're really s...

You can script it

0

08.06.2021

cyberknight777 | OP7TP

Innocent Devil
Also I should replicate them one by one on another...

um, fetch and merge doesn't work?

0

08.06.2021

Innocent Devil Автор вопроса

cyberknight777 | OP7TP
um, fetch and merge doesn't work?

Look There are two files and one folder, I'll call them executable lib scripts/ scripts structure was totally changed and I have to merge just that But I've subcategorized scripts by subfolders, in the branch I need to merge they're not categorized By merging I'd have duplicated scripts and possibly regressions in executable and lib code

0

08.06.2021

cyberknight777 | OP7TP

Innocent Devil
Look There are two files and one folder, I'll call...

You want to get only stuff in scripts/ ?

0

08.06.2021

Innocent Devil Автор вопроса

cyberknight777 | OP7TP
You want to get only stuff in scripts/ ?

Yeah

0

08.06.2021