undefined | Better HN

0 pointsyencabulator2y ago0 comments

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.

0 comments

3 comments · 1 top-level

Smaug1232y ago· 2 in thread

> 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.

yencabulatorOP2y ago

It's less of a fundamental limitation and more of a thing that hasn't been programmed yet. Feel free to do that.

Smaug1232y ago

I 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".)

1 more reply

j / k navigate · click thread line to collapse