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

Bug 354598

Summary: Mergetool doesnt overwrite change when you click on copy but adds
Product: [Eclipse Project] Platform Reporter: Christian Campo <christian.campo>
Component: CompareAssignee: Platform-Compare-Inbox <platform-compare-inbox>
Status: CLOSED WONTFIX QA Contact:
Severity: normal    
Priority: P3 CC: robin.rosenberg, sptaszkiewicz
Version: 4.2.2   
Target Milestone: ---   
Hardware: All   
OS: All   
Whiteboard: stalebug
Attachments:
Description Flags
mergetool screen 1
none
mergetool screen 2 none

Description Christian Campo CLA 2011-08-12 05:58:07 EDT 
When I rebase and have a conflict (local commit, conflicts with the commits from the branch I am rebasing on) the mergetool is opened.

In the mergetool I see the two changes and can i.e. copy the local version of the changes over. When I click on that arrow, I expect the local changes to replace the other changes. Instead they are added to the end of conflicting area.

I will attach two screenshots that show the problem.
Comment 1 Christian Campo CLA 2011-08-12 05:58:45 EDT 
Same problem with egit 1.0 and 1.1.0.201108110514
Comment 2 Christian Campo CLA 2011-08-12 06:02:01 EDT 
Created attachment 201379 [details]
mergetool screen 1
Comment 3 Christian Campo CLA 2011-08-12 06:02:24 EDT 
Created attachment 201380 [details]
mergetool screen 2
Comment 4 Robin Rosenberg CLA 2013-03-19 18:07:35 EDT 
Mergetool is part of Eclipse platform, not EGit. My guess is this behavior is intentional.
Comment 5 Szymon Ptaszkiewicz CLA 2013-03-20 06:46:41 EDT 
Christian, I'm not sure if I remember correctly, but this behaviour may differ if you toggle three-way compare.
Comment 6 Lars Vogel CLA 2019-11-27 07:17:43 EST 
This bug hasn't had any activity in quite some time. Maybe the problem got
resolved, was a duplicate of something else, or became less pressing for some
reason - or maybe it's still relevant but just hasn't been looked at yet.

If you have further information on the current state of the bug, please add it.
The information can be, for example, that the problem still occurs, that you
still want the feature, that more information is needed, or that the bug is
(for whatever reason) no longer relevant.

If the bug is still relevant, please remove the stalebug whiteboard tag.