74

Git Pull Failed, Merge Conflict.

Me:
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it
don't do it

Me:
Delete local project folder and pull the project down again.

Comments
  • 11
    Git101
  • 13
    The inofficial Git manual at xkcd 1597 recommends that, too. ;-)
  • 3
    I will never surrender...oh all right then....
  • 2
    How does anyone even come to that point? Learn git (and how to solve merge conflicts). That helps.
  • 2
    I'm glad that vs helps me out a lot
  • 2
    I once did this without saving the QT user file (it was .gitignored) ... That resulted in me spending a lot of time rebuilding all build-, debug- and run configurations by hand -.-
  • 8
    I'm always amazed how many people won't take 15 minutes to learn how to use git properly. It's not that hard, and will improve your developer life a lot.
  • 2
    @anroven right? How hard is it just to resolve the merge conflict?
  • 2
    Erm... What?

    git reset --hard origin/master

    Case closed.
  • 0
    git reset --hard HEAD
    git pull
  • 0
    @uyouthe that would only undo the merge attempt. Same as
    git merge --abort
  • 1
    @Yamakuzure If you haven't committed, try
    git stash
    git pull
    git stash pop
  • 1
    @Mitiko it doesn't matter whether you
    * commit->merge->conflict or
    * stash->pull->pop->conflict.

    With the merge you can at least use "-X theirs" ; which might get you around the conflicts.
Add Comment