IMO, it is unnecessary to commit the conflicts. Instead, you can see how merges were resolved by diffing the commits.
chrisamanse
[ my public key: https://keybase.io/chrisamanse; my proof: https://keybase.io/chrisamanse/sigs/V_gX5b0K47R_-bMiduTMFy9mdPolmQtDwg9go_Nmnd4 ]
Posts15
Comments14