git-imerge
Incremental merge for git (by mhagger)
git-mergify-rebase
Merge git changes one commit at a time. (by CTSRD-CHERI)
| git-imerge | git-mergify-rebase | |
|---|---|---|
| 12 | 4 | |
| 2,665 | 5 | |
| - | - | |
| 0.0 | 0.0 | |
| 12 months ago | about 3 years ago | |
| Python | Shell | |
| GNU General Public License v3.0 only | GNU General Public License v3.0 or later |
The number of mentions indicates the total number of mentions that we've tracked plus the number of user suggested alternatives.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
Stars - the number of stars that a project has on GitHub. Growth - month over month growth in stars.
Activity is a relative number indicating how actively a project is being developed. Recent commits have higher weight than older ones.
For example, an activity of 9.0 indicates that a project is amongst the top 10% of the most actively developed projects that we are tracking.
git-imerge
Posts with mentions or reviews of git-imerge.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-08-11.
- Dealing with Diverged Git Branches
- Pijul: Version-Control Post-Git • Goto 2023
-
Save rebase progress and attempt to cherry-pick?
Afaik, there's currently no official way to pause/stash a rebase/merge-in-progress. (There is git-imerge which supports incremental merges/rebases (basically split a big merge into smaller ones), but I never used it and think you'll need to use it from the start of a merge/rebase.)
-
I have a feature branch that is now way behind it's remote parent. How do I make this work?
Try git imerge.
-
What is the best way to undertake a heavyweight merge (dozens of files)?
If the merge is large in the number of commits involved git imerge may be useful to you. It breaks down one big merge into many smaller merges, essentially merging one new commit from each branch, one at a time. The advantage being that you only ever need to consider the conflict between two individual commits at a time.
- Git-imerge: Incremental merge for Git
-
strategy to update 2yo feature branch off of develop
The repo for it is https://github.com/mhagger/git-imerge and the blog post / instructions is at https://wilsonmar.github.io/git-imerge/
- interactive merge in git
-
Jujutsu – A Git-compatible DVCS that is both simple and powerful
Similar ideas have been discussed before in Git, but I don't think anyone has acted on them much. Michael Haggerty's git-imerge tries to make conflicts shareable, but I think it was more of a side-effect of the original goal of optimizing rebase/merge and auto-reducing conflicts to their minimal representation. I'm very curious how conflicts are represented in Jujutsu so I can better understand this power. I'm curious about how conflicts in conflict-resolution commits are handled and other such magic.
That gist seems like a simplified version of https://github.com/mhagger/git-imerge, so check that out if you haven't. (I haven't looked at git-imerge in a long time, so I should read about it again myself.)
git-mergify-rebase
Posts with mentions or reviews of git-mergify-rebase.
We have used some of these posts to build our list of alternatives
and similar projects. The last one was on 2023-08-11.
-
Pijul: Version-Control Post-Git • Goto 2023
A few more implementations of the bisect-rebase idea:
https://github.com/CTSRD-CHERI/git-mergify-rebase
- Official Elasticsearch Python library no longer works with open-source forks
- Git-mergify-rebase: merge or rebase Git changes one commit at a time
What are some alternatives?
When comparing git-imerge and git-mergify-rebase you can also consider the following projects:
jj - A Git-compatible VCS that is both simple and powerful
elasticsearch-py - Official Python client for Elasticsearch
pg_similarity - set of functions and operators for executing similarity queries
git-machete - Probably the sharpest git repository organizer & rebase/merge workflow automation tool you've ever seen
gumtree - An awesome code differencing tool
duckduckgo-locales - Translation files for <a href="https://duckduckgo.com"> </a>
mergify - Merge git changes on commit at a time.
git-stack - Stacked branch management for Git
pre-commit - A framework for managing and maintaining multi-language pre-commit hooks.
difftastic - a structural diff that understands syntax 🟥🟩
git-imerge vs jj
git-mergify-rebase vs elasticsearch-py
git-imerge vs elasticsearch-py
git-mergify-rebase vs pg_similarity
git-imerge vs pg_similarity
git-mergify-rebase vs git-machete
git-imerge vs gumtree
git-mergify-rebase vs duckduckgo-locales
git-imerge vs mergify
git-mergify-rebase vs git-stack
git-imerge vs pre-commit
git-mergify-rebase vs difftastic