DESCRIPTION

Introduce a mergeStrategy extension point.

The new extension point can be used to implement and register custom
merge strategies which can be used by EGit operations that require merge
(merge, rebase, pull, revert, squash, stash, submodule update).

Add a preference page to allow selection of the preferred merge
strategy.

Make sure that relevant operations use the preferred strategy.

Bug: 418151
Change-Id: I4d455ce171cca13c780e72b8d27dd929b28c6b71
Signed-off-by: Maleah Marks xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-08-30 20:44:46.000000000

Uploaded patch set 10: Commit message was updated.

-------------------------------------
author: Brenden Conley
date: 2015-08-30 21:01:39.000000000

Patch Set 10:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/7492/

-------------------------------------
author: Douglas Trujillo
date: 2015-08-30 21:04:44.000000000

Patch Set 10:

(4 comments)

still found some minor style nits, will upload a fix

Line:39, org.eclipse.egit.core.test/fragment.xml -> this line is too wide

Line:76, org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java -> weird formatting

Line:116, org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java -> s/SIDE/master/

Line:146, org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java -> wrong indentation

-------------------------------------
author: Douglas Trujillo
date: 2015-08-30 21:24:52.000000000

Patch Set 10:

(4 comments)

Line:39, org.eclipse.egit.core.test/fragment.xml -> Done

Line:76, org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java -> Done

Line:116, org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java -> Done

Line:146, org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/MergeWithPreferredStrategyTest.java -> Done

-------------------------------------
author: Brenden Conley
date: 2015-08-30 21:25:15.000000000

Patch Set 10: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7492/ : SUCCESS

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-08-31 09:36:26.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
