mirrors/jgit - jgit - source @ dussan.org

Verlauf

Thomas Wolf 8210f29fe4 Implement ours/theirs content conflict resolution Git has different conflict resolution strategies: * There is a tree merge strategy "ours" which just ignores any changes from theirs ("-s ours"). JGit also has the mirror strategy "theirs" ignoring any changes from "ours". (This doesn't exist in C git.) Adapt StashApplyCommand and CherrypickCommand to be able to use those tree merge strategies. * For the resolve/recursive tree merge strategies, there are content conflict resolution strategies "ours" and "theirs", which resolve any conflict hunks by taking the "ours" or "theirs" hunk. In C git those correspond to "-Xours" or -Xtheirs". Implement that in MergeAlgorithm, and add API to set and pass through such a strategy for resolving content conflicts. * The "ours/theirs" content conflict resolution strategies also apply for binary files. Handle these cases in ResolveMerger. Note that the content conflict resolution strategies ("-X ours/theirs") do _not_ apply to modify/delete or delete/modify conflicts. Such conflicts are always reported as conflicts by C git. They do apply, however, if one side completely clears a file's content. Bug: 501111 Change-Id: I2c9c170c61c440a2ab9c387991e7a0c3ab960e07 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		vor 3 Jahren
..
.settings	Enable and fix "Statement unnecessarily nested within else clause" warnings	vor 4 Jahren
META-INF	Prepare 5.12.0-SNAPSHOT builds	vor 3 Jahren
resources	Implement ours/theirs content conflict resolution	vor 3 Jahren
src/org/eclipse/jgit	Implement ours/theirs content conflict resolution	vor 3 Jahren
.classpath	Change JGit minimum execution environment to JavaSE-1.8	vor 7 Jahren
.gitignore	Finish removing Apache Felix maven-bundle-plugin	vor 14 Jahren
.project	Enforce the use of Java5 API:s only (with a few exceptions)	vor 12 Jahren
BUILD	Decouple JSch from JGit Core	vor 4 Jahren
about.html	Add missing about.html files to all shipped bundles	vor 13 Jahren
build.properties	Do not include log4j implementation in jgit	vor 4 Jahren
jgit.sh	Enable passing java options to jgit command line executable	vor 4 Jahren
plugin.properties	Fix bundle localization of Apache SSH bundle	vor 4 Jahren
pom.xml	Prepare 5.12.0-SNAPSHOT builds	vor 3 Jahren