Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Differences between Merge Modes
Differences between Merge Modes [message #1855029] Sat, 24 September 2022 14:19 Go to next message
Nenad Jovanovic is currently offline Nenad JovanovicFriend
Messages: 2
Registered: September 2022
Junior Member
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:

  1. Use the git pre-merged 'ours' version of conflicting files
  2. Use the working tree version of conflicting files (pre-merged by Git)
  3. 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 13:39 Go to previous messageGo to next message
Thomas Wolf is currently offline Thomas WolfFriend
Messages: 508
Registered: August 2016
Senior Member
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 13:42]

Report message to a moderator

Re: Differences between Merge Modes [message #1855055 is a reply to message #1855039] Mon, 26 September 2022 15:53 Go to previous message
Nenad Jovanovic is currently offline Nenad JovanovicFriend
Messages: 2
Registered: September 2022
Junior Member
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:
  


Current Time: Tue Nov 29 14:54:25 GMT 2022

Powered by FUDForum. Page generated in 0.01983 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top