me: sees a huge merge conflict

my anxiety: 📈📈📈📈📈📈📈📈📈📈📈📈📈📈

  • 1
    amen brother.
  • 2
    Be responsible: rebase early, rebase often.
  • 1
    Yes to @SortOfTested

    And there is 'Xtheirs' and 'Xours' and a few other knobs who can make your life easier.
  • 3
    Just check which merged branch caused the conflict, do an interactive rebase on master, completely removing their merge from history.

    Then set your git mail/name to the competing author's mail/name, create a new PR from their branch, edit title/description to be identical to the original PR.

    Then tell that author that you approved their PR, but that they do still have to resolve some merge conflicts... and they're like "but Bob told me yesterday that he merged my PR!", to which you reply: "Yeah but I think Bob was a bit drunk".
  • 1
    Before a learn about rebase, I can say that every week I got merge conflicts overwriting my code.
    I learned the hard way, resolving conflicts one by one, by hand. Just to be sure that my progress wasn't lost.

    Always remember to rebase, also if you want to sync your branch before commit, use the stash command, will help you out!
Add Comment