JGit/New and Noteworthy/5.12
org.eclipse.jgit.lib.ApplyCommandhas been enhanced to handle more cases. It now also supports applying binary delta or literal patch hunks.
- Merging now supports the content merge strategies ours and theirs. They replace in text conflicts all conflicting hunks by the "ours" or "theirs" version; they correspond to git merge -X ours/theirs.
CherrypickCommandhave new setters to set this
org.eclipse.jgit.merge.ContentMergeStrategy. The JGit command-line
org.eclipse.jgit.pgm.Mergecommand now supports the -X or --strategy-option command-line option. See the official git documentation for more information about the -X option.
The complete list of new features and bug fixes is available in the release notes.
The following 10 developers worked on this release:
Adithya Chakilam, David Ostrovsky, Han-Wen Nienhuys, Ivan Frade, Kyle Zhao, Marco Miller, Marija Savtchouk, Matthias Sohn, Thomas Wolf, Youssef Elghareeb