• 3
    I know it's a joke, but I actually prefer doing the merge myself. That way I can make sure someone hasn't just blindly clocked buttons to accept one set of changes or the other and screwed everything up as a result. Unpicking that mess after the merge has taken place and 10 other PRs have been stacked on it before anyone realised the issue is a nightmare.
  • 1
    Accept all incoming changes. Finito... Works great when merging to production 🤯
  • 1
    “Hey bill are you making any changes to the order screen ?”
    “Yeah joe a boatload . You ?”
    “Noooooo” *types frantically omg omg omg omg* lol
Add Comment