@wingo@mastodon.social @b0rk@social.jvns.ca I've found that by merge conflict time it's usually too late to really understand what's going on, it's just one of the pitfalls of the whole content tracker model git uses. I have better luck going back to the commits that touched the code, treating them as patches, and then logically re-applying them into the merge commit.