Are you looking for solutions within git or jj? In my experience with jj when resolving a conflict, as long as I do it in the earliest change, I will only have

Are you looking for solutions within git or jj? In my experience with jj when resolving a conflict, as long as I do it in the earliest change, I will only have to do it once. Git has the rerere setting [0] which reduces the need to resolve the same conflict over and over 0: https://git-scm.com/book/en/v2/Git-Tools-Rerere https://git-scm.com/book/en/v2/Git-Tools-Rerere