]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 912ef3d) | patch
Improve handling of checkout conflicts 73/5373/9
authorMarkus Duft <markus.duft@salomon.at>
Fri, 13 Jul 2012 06:25:25 +0000 (08:25 +0200)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Sat, 12 Jan 2013 01:32:44 +0000 (20:32 -0500)
commitbaf7ca9cc0d2bdf237a9bb19486d6fde5250a7f5
tree0a9d7f0fa4037f6b8f25f97fbf106c3663b80f56tree | snapshot
parent912ef3da19c7bc1975805e1e3e9746baf479c2becommit | diff
Improve handling of checkout conflicts

This converts a checkout conflict exception into a RebaseResult /
MergeResult containing the conflicting paths, which enables EGit (or
others) to handle the situation in a user-friendly way

Change-Id: I48d9bdcc1e98095576513a54a225a42409f301f3
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit