Merge or Cherry-Pick?

Artur de Souza asouza at
Wed Feb 2 11:04:16 GMT 2011

Quoting Oswald Buddenhagen <ossi at>:
> and remember that following receipes does *not* work if you don't
> actually understand what you are doing - there may always be some
> circumstances that make it a receipe for disaster. and from experience i
> can tell that some people are astonishingly stubborn with ignoring signs
> of disaster ...

A good tip if all went wrong is that git saves all the states for you.  
Just type:

git reflog

and you will see a log of every operation you did. If you messed up,  
try doing:

git reset --hard SHA1

where SHA1 is the sha1 of the last successful operation you did. but  
just use "reflog" in emergencies and try to not make it an habit!




More information about the kde-core-devel mailing list