]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 28ffed2) | patch
Abort merge when file to be checked out is dirty 33/2733/3
authorPhilipp Thun <philipp.thun@sap.com>
Thu, 17 Mar 2011 09:48:44 +0000 (10:48 +0100)
committerChristian Halstrick <christian.halstrick@sap.com>
Fri, 18 Mar 2011 16:04:50 +0000 (17:04 +0100)
commitbf05108d0b1aa7253659237d6848abc72c5e185e
tree605ee359b2e475b05f649dc2a28cad549fd791dftree | snapshot
parent28ffed23072e0b1e8697adc53448c2c71f0d1306commit | diff
Abort merge when file to be checked out is dirty

In case a file needs to be checked out (from THEIRS) during a merge
operation, it has to be checked if the worktree version of this file
is dirty. If this is true, merge shall fail.

Change-Id: I17c24845584700aad953c3d4f2bea77a0d665ec4
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit