Hey, I had done changes which needed incompatible fixes in 5.6 than in 7.0 and not merged yet.
Just pushed a git merge --strategy=ours; you may want to retry now. Bob > Am 16.07.2015 um 18:41 schrieb marius adrian popa <map...@gmail.com>: > > I have patched pdo_firebird driver in my local branch using this patch > https://bugs.php.net/bug.php?id=61183 > > I have an issue when merging with master > > > git merge --no-ff --log PHP-5.6 > Auto-merging ext/pdo_firebird/firebird_statement.c > CONFLICT (content): Merge conflict in ext/pdo_firebird/firebird_statement.c > Auto-merging Zend/zend_vm_execute.h > CONFLICT (content): Merge conflict in Zend/zend_vm_execute.h > Auto-merging Zend/zend_vm_def.h > CONFLICT (content): Merge conflict in Zend/zend_vm_def.h > Auto-merging Zend/tests/bug69732.phpt > CONFLICT (content): Merge conflict in Zend/tests/bug69732.phpt > Automatic merge failed; fix conflicts and then commit the result. -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
