23 Apr
2016
23 Apr
'16
11:04 p.m.
Le 24/04/2016 00:40, Peter Dimov a écrit :
Vicente J. Botet Escriba wrote:
Hr, I've forgotten that I did already a merge on master (without the push evidently).
Is there a way to undo a merge locally?
If you're on the master branch,
git reset --hard origin/master
will discard all your local commits and will reset your master branch to the state of the remote master branch. Thanks Peter.
Vicente