Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 336819

Summary:	'OURS'/'THEIRS' conflict markers are confusing in case of conflicts during rebase
Product:	[Technology] EGit	Reporter:	Edwin Kempin <edwin.kempin>
Component:	UI	Assignee:	Robin Stocker <robin>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	christian.campo, leachbj, mathias.kinzler, matthias.sohn, robin, stefan.lay
Version:	2.0
Target Milestone:	2.1
Hardware:	All
OS:	All
Whiteboard:

Description Edwin Kempin

2011-02-10 08:52:50 EST

Steps to reproduce:
1. have two branches, called 'ours' and 'theirs' that have conflicting changes, let's imagine 'ours' is a local branch with our changes whereas 'theirs' could be a remote tracking branch that brings in some new changes somebody else was doing
2. now we want to rebase our change -> the branch 'ours' is checked out, we select the branch 'theirs' in the Repositories view and choose 'Rebase' from the context menu -> the rebase results in a conflict
3. in the conflicting file the conflict is marked by the conflict markers '<<<<<<< OURS', '=======' and '>>>>>>> THEIRS', for the user it is surprising that the changes from the branch 'theirs' are shown under the OURS conflict marker, whereas the changes from the branch 'ours' is associated with the THEIRS conflict marker

Expected:
Not sure what is expected, since technically the behaviour is correct. Rebasing the branch 'ours' onto the branch 'theirs' means, that we start from the commit to which the branch 'theirs' points and then apply the change that was done on the branch 'ours' on top of it. 

Maybe it would be better to show the names of the branches (or the title line of the commit message) instead of 'OURS' and 'THEIRS' as conflict markers?

Comment 1 Mathias Kinzler

2011-03-18 11:37:48 EDT

(In reply to comment #0)

> Maybe it would be better to show the names of the branches (or the title line
> of the commit message) instead of 'OURS' and 'THEIRS' as conflict markers?

+1 (branch name + title would be even better)

Comment 2 Robin Stocker

2012-08-14 06:47:34 EDT

*** Bug 387182 has been marked as a duplicate of this bug. ***

Comment 3 Robin Stocker

2012-08-14 12:28:45 EDT

Pushed a JGit change to review for this:

https://git.eclipse.org/r/7222

Comment 4 Matthias Sohn

2012-08-17 18:41:17 EDT

merged as 5854ca091a22346e1c710ca9f875165afb3f2cc8

further improvement was pushed by Robin
https://git.eclipse.org/r/#/c/7279/

Comment 5 Robin Stocker

2012-08-18 03:46:25 EDT

For change I1333a8dd170bb0077f491962013485efb6f2a926:

I am the author of the content I am contributing. I own the copyright of the contributed content. I have the right to contribute the content to Eclipse.

Comment 6 Matthias Sohn

2012-09-02 17:39:09 EDT

merged as 03513ef305f3d4f8414ab7ac2624b6d2ca75b3ee

Comment 7 Robin Stocker

2012-09-02 18:14:27 EDT

Thanks Matthias.

Opened JGit bug 388647 for possible improvements of merge conflict markers.