Skip to main content

Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » JGit version of 'git merge-tree'
JGit version of 'git merge-tree' [message #1413057] Wed, 27 August 2014 17:01
Sneakers Please is currently offline Sneakers PleaseFriend
Messages: 1
Registered: August 2014
Junior Member

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?

Previous Topic:Merge does not respect mergeoptions
Next Topic:Configure... dialog for fetch shows wrong remote
Goto Forum:

Current Time: Tue Aug 04 05:44:39 GMT 2020

Powered by FUDForum. Page generated in 0.25362 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top