Communities

Writing
Writing
Codidact Meta
Codidact Meta
The Great Outdoors
The Great Outdoors
Photography & Video
Photography & Video
Scientific Speculation
Scientific Speculation
Cooking
Cooking
Electrical Engineering
Electrical Engineering
Judaism
Judaism
Languages & Linguistics
Languages & Linguistics
Software Development
Software Development
Mathematics
Mathematics
Christianity
Christianity
Code Golf
Code Golf
Music
Music
Physics
Physics
Linux Systems
Linux Systems
Power Users
Power Users
Tabletop RPGs
Tabletop RPGs
tag:snake search within a tag
answers:0 unanswered questions
user:xxxx search by author id
score:0.5 posts with 0.5+ score
"snake oil" exact phrase
votes:4 posts with 4+ votes
created:<1w created < 1 week ago
post_type:xxxx type of post
Search help
Notifications
Mark all as read
Q&A

Keep local branch changes to resolve all remaining conflicts in a merge

+4
−0

On branch-x, I do

git merge branch-y

Now there are some conflicts, and git status shows

Changes to be committed:
        new file:   a
        new file:   b

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both added:      w
        both modified:   x
        both added:      y
        both modified:   z1
        both modified:   z2

Specifically, the conflict of files z1 and z2 I have to resolve manually (by inspecting and eliminating the <<<<<<< HEAD, >>>>>>> branch-y markers).

But for all other conflicts, I want to keep the local changes, as if I always chose the <<<<<<< HEAD segment and never the >>>>>>> branch-y one.

I could of course do that manually, but there are many files left.

How can I merge all the remaining files by keeping the local branch changes only?

I found git merge --strategy-option ours but that doesn't seem to work for an already started merge:

error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Why does this post require moderator attention?
You might want to add some details to your flag.
Why should this post be closed?

0 comment threads

1 answer

+3
−0
git checkout --ours -- *

--theirs would do the opposite, i.e. keep the changes from branch-y.

Don't forget to git add later!

Why does this post require moderator attention?
You might want to add some details to your flag.

0 comment threads

Sign up to answer this question »

This community is part of the Codidact network. We have other communities too — take a look!

You can also join us in chat!

Want to advertise this community? Use our templates!

Like what we're doing? Support us! Donate