3 ms·
Maybe you want more local clones (git clone -l -s) or to use worktrees, so you can leave a merge conflict pending in one of them? Git doesn't have a way to "st
by yencabulator 3y ago
Maybe you want more local clones (git clone -l -s) or to use worktrees, so you can leave a merge conflict pending in one of them?
Git doesn't have a way to "store a partially resolved conflict" in a way that would remember that it hasn't been resolved. If you really want that, maybe you want to just commit the conflict markers and come back later; rebase the commits together once you're all the way done.
- Smaug123 3y ago> Git doesn't have a way to "store a partially resolved conflict" in a way that would remember that it hasn't been resolved. Exactly my point: this is a fundamental limitation of Git for which there is no good workaround. It's not inherent to the domain, but is a limitation of Git. Pijul (for example) considers conflicted states simply to be normal.
- yencabulator 3y agoIt's less of a fundamental limitation and more of a thing that hasn't been programmed yet. Feel free to do that.
- Smaug123 3y agoI do, thank you! (But it will never be the case that conflicts are modelled in Git, unless one uses notes or something to build a more expressive database on top of it, whereupon I think it's not really reasonable to call the resulting system "Git".)
- yencabulator 3y agoThe git object system is based on objects having types. There was a time when the "tag" object type did not exist. The only difference between then and now is the installed base.