alt Hacker NewsNice work! On a complete tangent, Git is the only SCM known to me that supports recursive merge strategy [1] (instead of the regular 3-way merge), which essentially always remembers resolved conflicts without you needing to do anything. This is a very underrated feature of Git and somehow people still manage to choose rebase over it. If you ever get to implementing merges, please make sure you have a mechanism for remembering the conflict resolution history :).
[1] https://stackoverflow.com/questions/55998614/merge-made-by-r...
Replies
Much more principled (and hence less of a foot-gun) way of handling conflicts is making them first class objects in the repository, like https://pijul.org does.
That's something new to me (using git for 10 years, always rebased)
I remember in a previous job having to enable git rerere, otherwise it wouldn't remember previously resolved conflicts.
https://git-scm.com/book/en/v2/Git-Tools-Rerere