Resolving a 'both added' merge conflict in git?

Question

I\'m rebasing in git, and one conflict I get is \'both added\' - that is, exactly the same filename has been added independently in my branch, and in the branch I\'m rebasin

Answer 1

I sometimes find it confusing using the --theirs and --ours options to identify where the file will come from. Most of the time mine will be in the branch I am rebasing which is referred to by --theirs!

You can also use git checkout -- src/MyFile.cs

Where the can be replaced either by the branch name or commit-id that contains the file you wish to keep.

git checkout 6a363d8 -- src/MyFile.cs

git checkout my_branch -- src/MyFile.cs

git checkout HEAD -- src/MyFile.cs