merged branches in incorrect order
| From: | Adam Baratz | Date: | Mon, 12 Sep 2016 21:53:33 +0000 |
| Subject: | merged branches in incorrect order | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-95956@lists.php.net to get a copy of this message | ||
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.
Thanks,
Adam