]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eeccc5a) | patch
Add Union merge strategy support 79/1203079/4
authorNasser Grainawi <quic_nasserg@quicinc.com>
Tue, 22 Oct 2024 02:26:35 +0000 (20:26 -0600)
committerNasser Grainawi <quic_nasserg@quicinc.com>
Mon, 4 Nov 2024 22:34:46 +0000 (15:34 -0700)
commit4f48a5b1e3842aeeae6b8f0f5d517819373221a4
treed913080723219af0ec023689234759414951928ctree | snapshot
parenteeccc5a92e78d6bef5908a61481e159e6c38288acommit | diff
Add Union merge strategy support

Allow users to specify the `union` strategy in their .gitattributes file
in order to keep lines from both versions of a conflict [1].

[1] https://git-scm.com/docs/gitattributes.html#Documentation/gitattributes.txt-union

Change-Id: I74cecceb2db819a8551b95fb10dfe7c2b160b709
org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmUnionTest.java [new file with mode: 0644] blob
org.eclipse.jgit/.settings/.api_filters diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.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