[#IDEADEV-14280] Add ability to merge in lines from both left and right in three way merge

IDEA: Development

Add ability to merge in lines from both left and right in three way merge

Created: 31 Jan 07 17:31 Updated: 22 Sep 07 17:48

Component/s:

Diff/Merge

Fix Version/s:

Diana Final

Original Estimate:

Unknown

Remaining Estimate:

Unknown

Time Spent:

Unknown

Environment:

« Hide

Mac OS X 10.4.8
JDK 1.5.0_06

Issue Links:

Duplicate

This issue is duplicated by:
	~~IDEABKL-2758~~ [CVS:Merge] allow apply both changes ...

Build:	6,148
Severity:	Low

Description

« Hide

When doing a three way merge, typically due to a version control conflict I often find that I want the final version to have the apparently conflicting lines from both left and right. Currently you have to choose one and then manually merge the other into the central pane. This is error prone. I would like to have the ability to merge in both. Perhaps once the line from left or right is chosen, a marker like the << marker could still be shown against the line that wasn't chosen, allowing this to also be merged in?

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Russell Egan - 19 Apr 07 01:06

Not to mention that sometime the merged code needs to include hand-merged elements from both sides. I've always felt plain old CVS markers did a better job than a 3-way merge, because you can easily cut and paste pieces from the conflicting sections to create the appropriate merged section, and because I can delete the conflict markers when I'm satisfied the conflict is resolved.

I think it would be great if idea let me copy from one side or the other, or both, but didn't remove the conflict marking until I told it the conflict is completely resolved. As it is now, I frequently start by copying one side over, but then the conflict marker disappears, and I can forget where the conflicted area on the other side was.

Additionally, it would be great to have a right-middle, left-middle, and right-left compare window that only displays the area in conflict.

[ Permlink | « Hide ]

Simon Dyson - 01 Aug 07 18:31

This is something that our team would like to see. At the moment pressing the 'X' will drop the changes from both sides. If you changed it so that the 'X' only dropped the change from that side then the user could keep only one of the changes by pressing 'X' on one side first and then '>>' on the other. If they press either of the '>>' without first pressing 'X' first then that would keep both changes with the side that they clicked being merged in above the other side.