On Wed, 2013-07-03 at 17:12 +0200, Sebastian Bergmann wrote: > Am 03.07.2013 17:00, schrieb Johannes Schlüter: > > Additionally I got merge conflicts due to this while merging 5.4 into > > 5.5, please verify the result there. > > Don't trust me that I verified my changes before committing? ;-) > PHP-5.5 already had the changes.
Still one has to merge the commit up to create a proper history - now I had a merge conflict while merging another change and had to figure out what the correct version of that file might be. johannes -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
