Re:Why large companies and fast-moving startups are banning ...
by jauntywundrkind on Friday December 29, 2023 @04:03PM
(#38810153)
Yeah it can be a bit of a pain. If you have long running branches or do keep hitting having to re-resolve, getting good at git rerere is recommended; "reuse recorded resolution"!
https://hn.algolia.com/?q=git+rerere