Comment by 1718627440

I mean that's what I do in Git as well, I just don't do it by storing conflicts, but by not triggering them/ignoring them.