Automatically delete conflict markers

Question

What is a quick way to remove conflict markers from source code?

I just merged some changes and now I have a lot of files in conflict.

I started manually deleting them. However, this will take too much time.

Is there a way git can automate this?

I just want to keep all the HEADs and drop all the others.

<<<<<<< HEAD
.
.
.
.
=======
.
.
.
.
>>>>>>> ffa5c899d36e779c23cff8b33f48f2ab95ef08c8

Answer 1

See this: save file in merge conflicts

Answer 2

This post will be useful to you: How to use my changes to merge in git?

I think you want: git merge otherbranch -s recursive -X ours

Answer 3

It looks like you are trying to resolve conflicts manually, not git mergetool.

StackOverflow has many pooling tools, for example:

• Meld
• p4merge

Conflict resolution is a fairly broad topic.

Some common practices:

• local check version (restore changes)

  git reset -- filename

• remote check version (change override)

  git checkout ORIG_HEAD -- filename

See also:

• Git on Windows: how do you install mergetool? - stack overflow
• What is the best visual merge tool for Git? - stack overflow