git-imerge
git-imerge copied to clipboard
mhagger
Incremental merge for git
#97 introduced instructions in the README to abort a git-imerge operation (after the prompt in #95): > If you need to completely abort an in-progress incremental merge, > first remove...
This is my first time using git-imerge, so apologies if this is user error. I tried to use git-imerge to rebase a very out of date feature branch to a...
``` $ git imerge --help No manual entry for git-imerge $ git-imerge --help usage: git-imerge [-h] ... ``` So for some reason `git-imerge` can print help, but git can't find...
I am currently doing my first git imerge on a clang repository and imerge is happily autofilling away since a couple of hours. It would be nice if there was...
At the moment, all it would have to do is rewrite the shebang line at the top of git-imerge to cause it to be run with the correct Python interpreter...
This was first discussed in #72. Suppose an imerge is in the following state: ``` o---0---1---2---3 | | | A---o---X | | | B---Y---? | C ``` Normally you would...
Given the fact that all the information is already present and all the hard work was already done it seemed easier to extend the tool than to redo the merge...
Some are probably obvious but it would be good to have them. Also I can't find how to run a test script after a tiny merge. Thanks.
I got the following output when attempting to use imerge to merge in https://github.com/odigeoteam/nui/tree/master from https://github.com/Stunner/nui/tree/all-changes. ``` $ git-imerge merge odigeoteam/master Attempting automerge of 1-1...success. Attempting automerge of 1-11...success. Attempting...
I started `git imerge finish` (in an imerge started with `git imerge merge foo`), then remembered that my `user.name` and `user.email` weren’t correctly set, so I cleared the commit message...
