Collectives™ on Stack Overflow

Find centralized, trusted content and collaborate around the technologies you use most.

Teams

Q&A for work

Connect and share knowledge within a single location that is structured and easy to search.

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 rebasing on. git status tells me:

# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#       both added:         src/MyFile.cs
My question is, how do I resolve this?  Must I use a merge tool or is there a way I can do it just from the commandline?  If I git rm src/MyFile.cs, how does git know which file version I want to remove and which I want to keep?
If you use git rm git will remove all versions of that path from the index so your resolve action will leave you without either version.
You can use git checkout --ours src/MyFile.cs to choose the version from the branch onto which you are rebasing or git checkout --theirs src/MyFile.cs to choose the version from the branch which you are rebasing.
If you want a blend you need to use a merge tool or edit it manually.
                Thanks.  And I just realized that the reason the merge tool wasn't working was because git creates the .LOCAL and .REMOTE files for the merge, but not the .BASE file.  I think it should just create an empty .BASE file.  If you manually create the empty .BASE file, the merge tool works fine.
– Jez
                Mar 22, 2012 at 14:29
                From @Tom answers :  When doing ...  git checkout --ours someFile  It may seem like it didn't do anything when doing git status.  Just Remember to do this afterwards.  git add someFile git status
– pec
                Oct 26, 2015 at 1:27
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 <tree-ish> -- src/MyFile.cs 
Where the <tree-ish> 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
                I can not stress how precise and important is this to be understood. Ours and theirs is just hiding what you really want, and that is to point which file you want to use as a resolution when both are added.
– zhrist
                Sep 21, 2021 at 23:13
git checkout --ours someFile
It may seem like it didn't do anything when doing git status.
Just Remember to do this afterwards.
git add someFile
git status
        
Thanks for contributing an answer to Stack Overflow!
Please be sure to answer the question. Provide details and share your research!
But avoid …
Asking for help, clarification, or responding to other answers.
Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.