Eclipse Community Forums: EGit / JGit » Differences between Merge Modes

Home » Eclipse Projects » EGit / JGit » Differences between Merge Modes

Differences between Merge Modes [message #1855029]

Sat, 24 September 2022 10:19

Eclipse User

In case of a conflict after a Git merge or rebase, the Merge Tool lets you choose between three different Merge Modes in Eclipse 2022-09:

Use the git pre-merged 'ours' version of conflicting files
Use the working tree version of conflicting files (pre-merged by Git)
Use HEAD (the last local version) of conflicting files

While the second option clearly differs from the other two in that it displays the Git markers in the left window, I do not see any difference between options #1 and #3. Does anybody know of a concrete example where these two options behave differently? Thanks.

Re: Differences between Merge Modes [message #1855039 is a reply to message #1855029]

Sun, 25 September 2022 09:39

Eclipse User

You need a file with multiple changes, one of which conflicts. Then #1 should show only the conflict as a difference, while #3 would show all changes as differences.

The EGit 5.12 New & Noteworthy page gives an example.

[Updated on: Sun, 25 September 2022 09:42] by Moderator

Re: Differences between Merge Modes [message #1855055 is a reply to message #1855039]

Mon, 26 September 2022 11:53

Eclipse User

Thank you for the explanation and the link, now it's clear to me!

Previous Topic:	Limit blob size with cloneRepository (equivalent to --filter=blob:limit=)
Next Topic:	Getting Transport Exception: cannot git upload pack

Goto Forum:

-=] Back to Top [=-

Current Time: Fri Oct 31 21:51:29 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter