Bug 391665 - Remove accepted incoming changes from merge tool diff view
Summary: Remove accepted incoming changes from merge tool diff view
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 2.2   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: helpwanted
Depends on:
Blocks:
 
Reported: 2012-10-11 09:23 EDT by Frank Jakop CLA
Modified: 2014-01-21 04:02 EST (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Frank Jakop CLA 2012-10-11 09:23:15 EDT 
We are migrating from cvs to git and experiencing one serious flaw concerning the merge tool. 
On resolving merge conflicts there are changes, which are no "real" conflicts. They are displayed in blue color. Clicking the arrow button on the separator accepts these changes and copies them from right to left, replacing my own piece of code.
In the cvs variant of the merge tool, these changes are no longer displayed after saving the partially merged file.
In the git variant, the changes remain visible, showing the same in the left and right part of the merge diff window.
Since we often have many changes to merge, this is very confusing.

We would like to have the accepted changes to vanish from the diff, which would greatly improve our performance. We are always using the latest nightly build.