Comments (1)
I'm glad that git-imerge
is useful to you.
im curious why there is no such feature directly in git availabe
Upstream Git didn't see a reason for git-imerge
to be integrated into the main Git project, because it can survive as an independent project.
It would obviously get a lot more visibility upstream, and possibly more contributions (especially given that I haven't had much time to work on it in ages). On the other hand, if it were upstream that would imply some commitment from the Git project to maintain it, it's not always possible to find contributors for more niche projects like this, and it would force more work on the maintainer.
I also feel like git-imerge
might have a limited target audience, consisting of people who are willing to learn how it works, which is conceptually more difficult than normal git merge
/ git rebase
; and who maintain a relatively clean history, since git-imerge
can currently only handle linear branches. So even if it were upstreamed, it might not become a standard tool.
If there were a clamour for this to become a standard part of Git and there were a bunch of people psyched about maintaining it, then there's nothing stopping them from trying to upstream it. I certainly wouldn't stand in the way and I intentionally chose a compatible license. But I personally can't commit to maintaining it; I have too little available time.
git rerere
predates git imerge
by a large margin, back in the days when independent Git-related projects had more trouble getting visibility. I don't think that the fact that git rerere
is in upstream Git has much to say about whether git-imerge
should be.
from git-imerge.
Related Issues (20)
- Interactive Rebase With History Preserving Past Merges HOT 1
- Skip incompatible merges HOT 1
- Identifying list of conflicting commits HOT 1
- Exact equivalent of `git rebase --onto ancient origin/ancient modern` ? HOT 2
- Error: untracked working tree files aborts imerge HOT 6
- Why autofills if automerge succeeds? HOT 2
- Merging a branch that has merge commits HOT 1
- non-zero exit status 128 HOT 2
- Is it possible to redo parts of an iterative merge? HOT 4
- add a stop, abort, or similar command HOT 5
- Cannot proceed dead lock ( maybe related to `git lfs` in history? ) HOT 2
- How to manually cleanup in case of a crash? HOT 4
- [Request] Keep diff3 conflictstyle as clear as without imerge HOT 3
- Automate ability to extend merge when source branches are updated HOT 3
- Stuck in a merge, imerge crashes when attempting to continue HOT 2
- backtracking repeats unrelated autofills
- possibility of merging unrelated histories
- add support for new Python `pyproject.toml` standard: `setup.py install` is deprecated
- Question: can git-imerge product a list of all conflicts in advance and their associated commits? HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from git-imerge.