# merging into master question

- Thread: https://externals.io/message/87205
- Original archive: https://news-web.php.net/php.internals/87205
- Started by marius adrian popa on 2015-07-16T16:41:14+00:00
- Messages: 2
- Reply by email to internals@lists.php.net
- More for agents: search with https://externals.io/search.md?q={query} · JSON API at https://externals.io/api · documentation at https://externals.io/llms.txt

---

## #87205 — marius adrian popa — 2015-07-16T16:41:14+00:00

URL: https://externals.io/message/87205#87205

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.

---

## #87206 — Bob Weinand — 2015-07-16T17:15:34+00:00

URL: https://externals.io/message/87205#87206 · In reply to: #87205

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 <mapopa@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.