# Merging PHP-5.6 into PHP-7.0 conflicts

- Thread: https://externals.io/message/96328
- Original archive: https://news-web.php.net/php.internals/96328
- Started by Christoph M. Becker on 2016-10-12T14:25:40+00:00
- Messages: 5
- 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

---

## #96328 — Christoph M. Becker — 2016-10-12T14:25:40+00:00

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

Hi!

It seems there has been an unresolved bad merge.  When I attempt an
empty merge from PHP-5.6 into PHP-7.0, Git reports 18 conflicting files.

Can somebody please have a look at this issue.

-- 
Christoph M. Becker

---

## #96329 — Anatol Belski — 2016-10-12T14:33:48+00:00

URL: https://externals.io/message/96328#96329 · In reply to: #96328

Hi Christoph,

> -----Original Message-----
> From: Christoph M. Becker [mailto:cmbecker69@gmx.de]
> Sent: Wednesday, October 12, 2016 4:26 PM
> To: PHP Internals <internals@lists.php.net>
> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
> 
> Hi!
> 
> It seems there has been an unresolved bad merge.  When I attempt an empty
> merge from PHP-5.6 into PHP-7.0, Git reports 18 conflicting files.
> 
> Can somebody please have a look at this issue.
> 
Yeah, there are some patches not merged yet. I'm doing the porting work ATM, it should be resolved later today or tomorrow as latest.

Thanks

Anatol

---

## #96330 — Christoph M. Becker — 2016-10-12T14:41:48+00:00

URL: https://externals.io/message/96328#96330 · In reply to: #96329

Hi Anatol!



> > […]
> Yeah, there are some patches not merged yet. I'm doing the porting work ATM, it should be resolved later today or tomorrow as latest.

Thanks! (also for the quick reply)

-- 
Christoph M. Becker

---

## #96334 — Stanislav Malyshev — 2016-10-13T05:11:31+00:00

URL: https://externals.io/message/96328#96334 · In reply to: #96330

Hi!

> > […]

Sorry, that was caused by 5.6 security fixes being in progress of being
merged. I should have sent a message to internals, but forgot to. I
apologize. Will do so in the future when starting big merges that may
leave the repos in a weird state for a while.

-- 
Stas Malyshev
smalyshev@gmail.com

---

## #96337 — Christoph M. Becker — 2016-10-13T09:52:19+00:00

URL: https://externals.io/message/96328#96337 · In reply to: #96334

Hi!



> > […]
> 
> Sorry, that was caused by 5.6 security fixes being in progress of being
> merged. I should have sent a message to internals, but forgot to. I
> apologize. Will do so in the future when starting big merges that may
> leave the repos in a weird state for a while.

Thanks! :-)

--
Christoph M. Becker