Bug 16 - auto-merge button (1GBBEBB)
Summary: auto-merge button (1GBBEBB)
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 2.0   Edit
Hardware: All All
: P5 normal (vote)
Target Milestone: ---   Edit
Assignee: James Moody CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-10-10 21:35 EDT by James Moody CLA
Modified: 2023-03-17 10:32 EDT (History)
0 users

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 James Moody CLA 2001-10-10 21:35:01 EDT 
In the merge view, I'd like to have an auto-merge button with the semantics:
	"Copy all non-conflicting incoming changes from the server resource to the local resource".
	After clicking on that button, I would only have to look at the red stuff (conflicting incoming changes)
	and decide what to do with them.

	CVS users are used to auto-merge in the "trivial" case where the changes on the source code (line) level don't overlap.
	When I used CVS, the normal mode for me was to not look at changes at all unless they are non-overlapping.

	I don't know what the existing buttons "Copy all from left to right" and "Copy all from right to left" are good for.

NOTES:
Comment 1 DJ Houghton CLA 2001-10-23 23:39:27 EDT 
PRODUCT VERSION:
	JT 0.036 JDK (VCM: 0.037)
Comment 2 Genady Beryozkin CLA 2001-12-07 06:47:07 EST 
Anything new with this bug ?
Comment 3 James Moody CLA 2001-12-07 10:22:46 EST 
Nope. We're currently busy hacking on making the new 2.0 team code stable; once 
it is we will be able to reevaluate these sorts of PRs.
Comment 4 James Moody CLA 2002-02-08 14:43:37 EST 
Added auto-merge support in the latest 2.0 team codebase. Auto-mergeable files 
are shown with a different icon, and user is prompted to automatically merge 
changes if they choose to update.
Comment 5 Eclipse Genie CLA 2020-10-20 05:34:20 EDT 
New Gerrit change created: https://git.eclipse.org/r/c/www.eclipse.org/jdt/+/170992
Comment 7 Eclipse Genie CLA 2020-10-21 10:38:26 EDT 
New Gerrit change created: https://git.eclipse.org/r/c/jdt/eclipse.jdt.debug/+/171066
Comment 8 Eclipse Genie CLA 2023-03-17 09:50:15 EDT 
New Gerrit change created: https://git.eclipse.org/r/c/papyrus/org.eclipse.papyrus-sirius/+/200652
Comment 9 Eclipse Genie CLA 2023-03-17 09:50:16 EDT 
New Gerrit change created: https://git.eclipse.org/r/c/papyrus/org.eclipse.papyrus-sirius/+/200651