How to do an “ours” merge using the Eclipse git merge tool?

Question

I\'m trying to do a merge where I have conflicts and one file has diverged massively. The eclipse git merge tool is great for small changes, but one of my files is large an

Answer 1

In the editor of the merge tool, you can edit the left section.

After clicking on Merge Tool, select the "HEAD" option in the dialog that appears, then the left section will contain the same content as HEAD.

So when the left section is already good, just make a small modification, undo it and then save. The modification is necessary because save is not available from the beginning.

Answer 2

There is now an entry "Replace With" that allows you to select "Ours" or "Theirs" in the context menu for files in the Git Staging view.