DESCRIPTION

[stagingView] Add "Replace With > Ours/Theirs" menu for conflicts

Note that this also requires JGit change
Ie2b3685d958c09b241991b74e6177401e8a1ebc9 for it to work for add/add
conflicts.

To get a nicer "theirs" in case of rebasing, reading some of the files
in .git/rebase-merge/ would be required.

Change-Id: I9e1ddb7bb2cf295fcb6d18ffa4393fcc6dac605e
Signed-off-by: Danika Greer xxx@xxx.xxx


COMMENTS

author: Danika Greer
date: 2014-11-30 10:44:54.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2014-11-30 10:47:15.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/417/

-------------------------------------
author: Brenden Conley
date: 2014-11-30 10:47:59.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/417/ : FAILURE

-------------------------------------
author: Brenden Conley
date: 2014-12-01 10:33:05.000000000

Patch Set 1: -Verified

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/427/

-------------------------------------
author: Brenden Conley
date: 2014-12-01 10:48:58.000000000

Patch Set 1: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/427/ : temporary update site https://hudson.eclipse.org/egit/job/egit-stable.gerrit/${BUILD_NUMBER}/artifact/org.eclipse.egit.repository/target/repository/

-------------------------------------
author: Douglas Trujillo
date: 2014-12-12 22:22:08.000000000

Patch Set 1: Code-Review-1

(1 comment)

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java -> missing license header

-------------------------------------
author: Douglas Trujillo
date: 2014-12-12 23:28:41.000000000

Patch Set 1:

(1 comment)

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ReplaceWithOursTheirsMenu.java -> Done

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