CODEWITHSUNDEEP
gitmergerebase
Jez
Jez

Reputation: 30013

Resolving a 'both added' merge conflict in git?

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

What are my options to resolve this either by a merge tool or from the commandline?

If I were to use git rm src/MyFile.cs, how would it know which file version I wanted to remove or keep?

Upvotes: 172

Views: 107275

Answers (3)

Tom
Tom

Reputation: 1650

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

Upvotes: 53

CB Bailey
CB Bailey

Reputation: 792229

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.

Upvotes: 179

Anas Alkhatib
Anas Alkhatib

Reputation: 1150

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

Upvotes: 88

Related Questions