]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d446f4) | patch
Detect and handle a checkout conflict during merge nicely 00/11700/2
authorRobin Rosenberg <robin.rosenberg@dewire.com>
Sat, 6 Apr 2013 12:03:24 +0000 (14:03 +0200)
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>
Mon, 8 Apr 2013 09:48:09 +0000 (05:48 -0400)
commit59baf9148e4b16028203d9e881136ab4c005202c
tree6068f07e0faa8389a43c40f8b5ff72b7ffd2fbd9tree | snapshot
parent5d446f410d7044fba165ad3deee7ac83864f0e96commit | diff
Detect and handle a checkout conflict during merge nicely

Report the conflicting files nicely and inform the user.

Change-Id: I75d464d4156d10c6cc6c7ce5a321e2c9fb0df375
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java diff | blob | history
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit