Chris Adams on Nostr: npub1upkp7…4tcwy Your first point is really good. One thing I've found helps if you ...

npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) Your first point is really good. One thing I've found helps if you need to do that on on multiple branches (very much a “endeavor not to do this” situation) is enabling the rerere extension which will remember how you resolved a particular conflict before:

https://git-scm.com/book/en/v2/Git-Tools-Rerere