RE: [PHP-DEV] merged branches in incorrect order
| From: | Adam Baratz | Date: | Tue, 13 Sep 2016 00:06:06 +0000 |
| Subject: | RE: [PHP-DEV] merged branches in incorrect order | ||
| References: | 1 2 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-95960@lists.php.net to get a copy of this message | ||
> To keep it clean, you can
>
> git checkout master
> git reset --hard origin/master
>
> and same for every branch containing a wrong merge. This will reset every
branch to the state of remote, after that you can repeat the merge clean
way.
Yes, but in this case, I'd already pushed.