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

......please 😭

Is that an open source project? I could help if I could look at the complete source tree.

Stash, hard Reset and retry from scratch?

In case of mergeconflict I call my teammate :)

@Jilano I literally LOL'd at that one 😄 😝

Git pull origin <branch> --rebase

@NeatNerdPrime eventually fixed it and got my branch merged! thanks, everyone for the support lool

@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.

@David-Chuka I hope you'll be a better person from now on 😝