Once a user starts performing merges and trying to fix conflicts by hand, simplicity goes out the windows. It’s not git, but any tree system that has to track and merge content. Same thing would happen with any other tool if the user is trying to “recreate” revisions that had bad merges.