11

Trying to resolve merge conflicts and you cant remember which changes are the ones you want to keep. Lesson learned, make sure your pull requests dont sit waiting for weeks while master is happily being worked on.

Comments
  • 1
    I once pulled to master after one month on a active project.

    10/10 would not do that again.
  • 0
    It's all about git flow...
Add Comment