Hi! On 9/12/16 2:53 PM, Adam Baratz wrote: > 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.
As long as you merge up (7.0->7.1, 7.1->master) it's fine. Correct order is 7.0->7.1->master but if you did 7.0->master once it's no big deal. Main thing is to never merge down (master->7.0), that would mess up a lot of things. -- Stas Malyshev smalys...@gmail.com -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
