14
LMagnus
5y

Doesn't matter how many years I do this job, a merge conflict will always stop my heart for a good few seconds.

Comments
  • 0
    But why? I just deal with them. Most of the time I even expect them and I am surprised if there is none.
    I am really curious maybe there is a way to help you
  • 1
    We fucked up when we decided to use the term « conflict ».

    There is really nothing to sweat about. It's a feature you should abuse.
  • 1
    @ShotgunSurgeon doesn't matter how trivial they are, it's still a pain when things don't go smoothly.
  • 1
    I often get merge conflicts when pulling, so I stash changes, checkout to development, pull, checkout to my own branch, rebase development onto my own branch and then pull. Then I just git stash pop and everything is just fine. :)
  • 3
    sometimes it's even trippier when the pull happens without conflicts, but you expect them to happen and hope that the code hasn't broken anyways...
  • 0
    Merge conflict used scare me as well. Once I saw this video: https://youtu.be/duqBHik7nRo

    It doesn't scare me that much.
  • 0
    @marcus5914 it's not that I'm scared. More irritated.

    But will check out link!
Add Comment