git-imerge
git-imerge copied to clipboard
mhagger
Incremental merge for git
The following version of Python are EOL. They are no longer receiving bug fixes including for security issues. The following table at the following link shows branch status with dates:...
In https://github.com/jyasskin/chromium, I'm trying to rebase-with-history `service-worker-apps` (e49557a06ee349daee3edbac71b565ff315509cd) onto `lkgr^` (ac5e723c9b830fecd3d13c65b66b0e0fd36e51f9). This gave the following output: ``` $ git imerge start --first-parent --goal=rebase-with-history --name service-worker-apps lkgr^ Attempting automerge of 1-1...success....
For the best practices. 
git rebase and git merge both have "--abort" and "--quit" options for stopping a merge. The git imerge tool does not seem to have a similar option or command. It...
The unmerged files have changes in them that just need to be staged, but no conflict markers It's not terrible, but it's confusing, and it wastes time and energy in...
_This is more a question than an "issue". I've posted the very same question [on StackOverflow](https://stackoverflow.com/q/68918718/6403504) already, hoping for it to just be me being unable to find the information...
First time I tried this it failed due to me stupidly using a worktree. with a fresh clone I got further, but still died. Autofilling 6-145...Traceback (most recent call last):...
Sorry if this has already been asked, I tried to search for existing issues but couldn't find anything! - `master` branch only contains merge commits. - When I work on...
This adds a minimap with dimensions and branch names to `diagram` output to clarify what goes where, ``` Key: Map: * = merge done manually o-0-1-2..-131 upstream/master . = merge...