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

前端 未结 2 1496
醉酒成梦
醉酒成梦 2020-12-10 05:43

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

2条回答
  •  攒了一身酷
    2020-12-10 06:04

    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.

提交回复
热议问题