Joined January 2018
·

taniaga

Hello
I have tried that and result is not expected.
What I try to do is:

I have a very old file1 in branchA that contains a couple of functions that I need
I have the latest version of file1 in branchB

I need to merge (i do not know if this is the correct concept, maybe rebase?) some differences (the functions that i need) that are in the version of file in branchA to the branchB.

With this solution you propoused, there is a substitution but not a merge.

Achievements
1 Karma
0 Total ProTip Views