Avatar billede fredand Forsker
09. september 2017 - 09:39 Der er 1 løsning

What will git reset do in this situation?

Hello
I have done a lot of work on many files. I have done several commits. Yesterday it was time to push but before I did a pull. During the pull there was several conflicts and I had to manually merge them. So now I am in stat my_branch|MERING. How ever I does not solve the merging since things does not work any more. I need to get back to the staten before my last git pull and try again.
Will git reset do that for me?
Best regards
Fredrik
Avatar billede fredand Forsker
09. september 2017 - 17:43 #1
Hello Guys!
git reset --hard <last good SHA>
...took me back to stage before git pull.
Now I need to figure out what is the delta between my branch and what will be pulled.
Best regards
Fredrik
Avatar billede Ny bruger Nybegynder

Din løsning...

Tilladte BB-code-tags: [b]fed[/b] [i]kursiv[/i] [u]understreget[/u] Web- og emailadresser omdannes automatisk til links. Der sættes "nofollow" på alle links.

Loading billede Opret Preview
Kategori
Kurser inden for grundlæggende programmering

Log ind eller opret profil

Hov!

For at kunne deltage på Computerworld Eksperten skal du være logget ind.

Det er heldigvis nemt at oprette en bruger: Det tager to minutter og du kan vælge at bruge enten e-mail, Facebook eller Google som login.

Du kan også logge ind via nedenstående tjenester