our new Git set-up at work only allows conflicts to be resolved by taking my code… Personally I don’t have an issue with this…