Comment Comment by chrisamanse IMO, it is unnecessary to commit the conflicts. Instead, you can see how merges were resolved by diffing the commits. parent chrisamanse 10 years ago
