17

Dear God please if you help me fix this merge conflict, I'll be a better person.....please

......please 😭

Comments
  • 2
  • 7
    We both know that's a lie.
  • 0
    Is that an open source project? I could help if I could look at the complete source tree.
  • 1
    Stash, hard Reset and retry from scratch?
  • 1
    In case of mergeconflict I call my teammate :)
  • 2
    @snooky You call him what? A cunt?
  • 1
    @Jilano I literally LOL'd at that one 😄 😝
  • 0
    Git pull origin <branch> --rebase
  • 1
    @NeatNerdPrime eventually fixed it and got my branch merged! thanks, everyone for the support lool
  • 0
    @NeatNerdPrime I've gotten merge conflicts from that too. when my existing state was clean. So, no, I don't trust `rebase` enough to always be good.

    But I think I can successfully navigate merge conflicts now. I find the root cause of the merge conflict, fix it ( if possible ) and then attempt `rebase` and then move on.
  • 1
    @David-Chuka I hope you'll be a better person from now on 😝
Add Comment