Phil Beauvoir
Phil Beauvoir
A first stage might be to look at "commit". It still requires some refactoring of the code, though.
Moved this to the coArchi issue tracker. Sorry, there's not enough info to diagnose this, and it's unlikely that it's anything that can be fixed in coArchi itself. Perhaps the...
Lots of information to digest. I'm going to need some help to break this down into a sequence of events. :-) Perhaps it would be easier (for me at least)...
I've just committed a basic merge Action which is the "Workflow for "offline" merge" above. We need to test this now to see if this is correct or for side-effects.
> I've just tested. This seems mostly correct but I noticed that in the conflict UI, "Theirs" shows bad information (it seems that "theirs" model is not extracted from the...
We need to review the sequence of events in `MergeBranchAction` to check whether we've made the right assumptions about what needs to happen.
Are there any options on the `MergeCommand` that we need to set or unset? http://download.eclipse.org/jgit/site/4.5.0.201609210915-r/apidocs/org/eclipse/jgit/api/MergeCommand.html > What merge-strategy that JGit uses Looking at the source code of `MergeCommand` it seems...
I've looked at the source code for `MergeCommand` and seen that if an option is not set explicitly JGit will use settings in the config file for the branch. To...
Regarding the next stage for branch merging, how should we achieve this? Is it the case that the user needs to do some actions first before a merge? - Pull...
My fear is that's a lot of dialog boxes and stages that need to be strung together (and where a "fail" could happen at any stage). - Choice dialog -...