]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2345cc8) | patch
Allow file mode conflicts in virtual base commit on recursive merge. 30/178730/4
authorMarija Savtchouk <mariasavtchouk@google.com>
Thu, 1 Apr 2021 14:52:26 +0000 (15:52 +0100)
committerMarija Savtchouk <mariasavtchouk@google.com>
Tue, 6 Apr 2021 08:33:04 +0000 (09:33 +0100)
commit7ceb61494bba8e3de16c26d1b3c36d4d74fb4975
treec26ece5887f4f175938fa18e0f4c0617e97abf15tree | snapshot
parent2345cc88d0ed7b6d639ba7a1874f2200f3b21df1commit | diff
Allow file mode conflicts in virtual base commit on recursive merge.

Similar to https://git.eclipse.org/r/c/jgit/jgit/+/175166, ignore
path that have conflicts on attributes, so that the virtual base could
be used by RecursiveMerger.

Change-Id: I99c95445a305558d55bbb9c9e97446caaf61c154
Signed-off-by: Marija Savtchouk <mariasavtchouk@google.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.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