Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:95958
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error)
To: "'Adam Baratz'" <adambaratz@php.net>,
	<internals@lists.php.net>
References: <CADxrgCPPWyVqSRqTzjTTh-Zy5CDYP7ws==dj03qNuk7yDDZNkA@mail.gmail.com>
In-Reply-To: <CADxrgCPPWyVqSRqTzjTTh-Zy5CDYP7ws==dj03qNuk7yDDZNkA@mail.gmail.com>
Date: Tue, 13 Sep 2016 00:40:15 +0200
Message-ID: <004101d20d46$a40be340$ec23a9c0$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Thread-Index: AQGSCDM2GzJvUx5Tyi1bQt99NWPJLqD2fByw
Content-Language: en-us
Subject: RE: [PHP-DEV] merged branches in incorrect order
From: anatol.php@belski.net ("Anatol Belski")

Adam,

> -----Original Message-----
> From: Adam Baratz [mailto:adambaratz@php.net]
> Sent: Monday, September 12, 2016 11:54 PM
> To: internals@lists.php.net
> Subject: [PHP-DEV] merged branches in incorrect order
>=20
> 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.
>=20
To keep it clean, you can=20

git checkout master
git reset --hard origin/master

and same for every branch containing a wrong merge. This will reset =
every branch to the state of remote, after that you can repeat the merge =
clean way.

Regards

Anatol