DESCRIPTION

Introduce a mergeStrategy extension point.

Preference page for users to select the strategy they want.
Make sure that relevant operations use the preferred strategy.

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


COMMENTS

author: Maleah Marks
date: 2015-08-28 10:42:27.000000000

Uploaded patch set 8.

-------------------------------------
author: Brenden Conley
date: 2015-08-28 10:42:33.000000000

Patch Set 8:

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

-------------------------------------
author: Maleah Marks
date: 2015-08-28 10:45:27.000000000

Patch Set 8:

I rebased the change and resolved the conflicts.

I reverted the move of the 'use models' preference from ui to core since it's no longer useful, the extension point not being related to the 'use models' preference anymore.

I linked the change to bug 418151.

Thanks in advance!

-------------------------------------
author: Brenden Conley
date: 2015-08-28 11:05:31.000000000

Patch Set 8: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-08-30 20:39:02.000000000

Patch Set 8: Code-Review-1

(6 comments)

Line:239, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> JGit's default merge strategy

Line:241, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> no, this condition was removed

Line:664, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> this constructor can be declared private

Line:670, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> this method can be declared private

Line:747, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> s/iff/if/

Line:750, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> typo s/erturn/return/

-------------------------------------
author: Douglas Trujillo
date: 2015-08-30 20:41:04.000000000

Patch Set 8:

(6 comments)

Line:239, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> Done

Line:241, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> Done

Line:664, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> Done

Line:670, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> Done

Line:747, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> Done

Line:750, org.eclipse.egit.core/src/org/eclipse/egit/core/Activator.java -> Done

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

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

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