RE: [PHP-DEV] merged branches in incorrect order
| From: | Anatol Belski | Date: | Mon, 12 Sep 2016 22:40:15 +0000 |
| Subject: | RE: [PHP-DEV] merged branches in incorrect order | ||
| References: | 1 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-95958@lists.php.net to get a copy of this message | ||
Adam,
> -----Original Message-----
> From: Adam Baratz [mailto:adambaratz@php.net]
> Sent: Monday, September 12, 2016 11:54 PM
> To: internals@lists.php.net
> Subject: [PHP-DEV] merged branches in incorrect order
>
> I was following https://wiki.php.net/vcs/gitworkflow to make my
> first commit
> to ext/pdo_dblib. I made a little mistake. I committed first to PHP-7.0. I forgot
> about the PHP-7.1 branch and merged from PHP-7.0 to master. I went back and
> merged from PHP-7.0 to PHP-7.1. All merges applied cleanly, but will this cause
> git history issues? Figured it would be better to check what to do next than to do
> any preemptive cleanup.
>
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.
Regards
Anatol