mirrors/jgit - jgit - source @ dussan.org

Historia

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>		3 lat temu
..
ContentMergeStrategy.java	Implement ours/theirs content conflict resolution	3 lat temu
EolAwareOutputStream.java	Fix javadoc in org.eclipse.jgit merge package	6 lat temu
MergeAlgorithm.java	Implement ours/theirs content conflict resolution	3 lat temu
MergeChunk.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
MergeConfig.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
MergeFormatter.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
MergeFormatterPass.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
MergeMessageFormatter.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
MergeResult.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
MergeStrategy.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
Merger.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
RecursiveMerger.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ResolveMerger.java	Implement ours/theirs content conflict resolution	3 lat temu
SquashMessageFormatter.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StrategyOneSided.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StrategyRecursive.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StrategyResolve.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
StrategySimpleTwoWayInCore.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ThreeWayMergeStrategy.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
ThreeWayMerger.java	Update EDL 1.0 license headers to new short SPDX compliant format	4 lat temu
package-info.java	Add Javadoc description for packages	11 lat temu