DESCRIPTION

Support checking out stage with DiscardChangesOperation

For resolving conflicts, we want to be able to do `git checkout --ours`
or `git checkout --theirs` for a path.

Change-Id: Ia6d003993ad1016602ff960203b3526cd884bad2
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:46:27.000000000

Patch Set 1:

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

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

Patch Set 1: Verified-1

Build Failed 

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

-------------------------------------
author: Brenden Conley
date: 2014-12-01 10:17:40.000000000

Patch Set 1: -Verified

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

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

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/426/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2014-12-12 08:03:56.000000000

Patch Set 1: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2014-12-12 08:19:03.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/470/ : UNSTABLE

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

Patch Set 1: Code-Review-1

(2 comments)

Line:58, org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java -> no need for since tag since this is an internal package

Line:123, org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java -> no need for since tag

-------------------------------------
author: Douglas Trujillo
date: 2014-12-12 23:14:43.000000000

Patch Set 1:

(2 comments)

Line:58, org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java -> Done

Line:123, org.eclipse.egit.core/src/org/eclipse/egit/core/op/DiscardChangesOperation.java -> Done

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