git-imerge
git-imerge copied to clipboard
mhagger
Incremental merge for git
I have a large merge that I'm trying to perform with `imerge`, reproducable as follows: ``` git clone https://github.com/roofit-dev/root.git cd root git checkout MP_ZeroMQ-new_multiprocess git-imerge start --name=RooFit_MultiProcess_PR --first-parent master ```...
What is the equivalent of the most general case of rebase: ```shell git rebase --onto COMMIT1 COMMIT2 COMMIT3 ``` ?
I've been recommended to use `--user` instead of `sudo` for python package installs, but this fails for `git-imerge` Can this be done in some way that does not require superuser...
Suppose I have two commits that don't merge easily Is it possible to skip the difficult merge and continue merging elsewhere? The complete merge might look like the diagram below...
I'm not sure whether it's possible to add support for this, but it'd be nice to be able to choose a merge strategy and custom strategy options (or if that's...
Twice now, I've been working in different repositories and wishing that '`git imerge`' had an equivalent to '`git rebase -i --preserve=merges`' I could use to 'rebase with history.' For whatever...
For example, after I resolve a merge conflict, if I run tests and find I need to make corrections, can I add new commits before `git imerge continue`ing or must...
imerge is awesome; thank you for this wonderful tool! I have a use-case that's not necessarily well-served, at least by easily findable documentation. I've been on several teams that had...
Since git-imerge can track which merges were made automatically and which manually due to conflicts, and because manual merges can themselves be done incorrectly by the user, it could be...
