|JGit version of 'git merge-tree' [message #1413057]
||Wed, 27 August 2014 17:01
| Sneakers Please
Registered: August 2014
I'm trying to get JGit to output the results of a three-way merge but without changing anything in the working directory. The second answer here:
does what I want using git. Essentially:
git merge-tree `git merge-base branch_one branch_two` branch_one branch_two
Is there any way to get JGit to produce equivalent output?
I've got as far as creating a ResolveMerger with inCore = true. This more or less seems to produce the results that I need although I'd need to format the objects into the git-style output myself. Also, it doesn't expose the toBeDeleted member.
Is there an easier way to do this or is this feature missing from JGit?
Powered by FUDForum
. Page generated in 0.01989 seconds