Subject: Re: [boost] [1.61.0] Master branch is closed
From: Vicente J. Botet Escriba (vicente.botet_at_[hidden])
Date: 2016-04-23 19:04:21
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.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk