i promise i know how to use git - 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 i - devRant

Ranter

Comments

11

devTea

24382

5y

Git101
13

Fast-Nop

40304

5y

The inofficial Git manual at xkcd 1597 recommends that, too. ;-)
3

lordfingle

177

5y

I will never surrender...oh all right then....
2

jote

6

5y

How does anyone even come to that point? Learn git (and how to solve merge conflicts). That helps.
2

dontbeevil

4821

5y

I'm glad that vs helps me out a lot
2

Snob

2105

5y

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

anroven

366

5y

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

bhouston

4180

5y

@anroven right? How hard is it just to resolve the merge conflict?
1

Yamakuzure

1794

5y

Erm... What?

git reset --hard origin/master

Case closed.
0

kiki

33051

5y

git reset --hard HEAD
git pull
0

Yamakuzure

1794

5y

@uyouthe that would only undo the merge attempt. Same as
git merge --abort
1

Mitiko

6375

5y

@Yamakuzure If you haven't committed, try
git stash
git pull
git stash pop
1

Yamakuzure

1794

5y

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

devRant © 2021 Hexical Labs LLC
Privacy Policy | Terms of Service