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

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.