Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:95960
Return-Path: <adam.baratz@gmail.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 70036 invoked from network); 13 Sep 2016 00:06:12 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 13 Sep 2016 00:06:12 -0000
Authentication-Results: pb1.pair.com smtp.mail=adam.baratz@gmail.com; spf=pass; sender-id=pass
Authentication-Results: pb1.pair.com header.from=adambaratz@php.net; sender-id=unknown
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.218.42 as permitted sender)
X-PHP-List-Original-Sender: adam.baratz@gmail.com
X-Host-Fingerprint: 209.85.218.42 mail-oi0-f42.google.com  
Received: from [209.85.218.42] ([209.85.218.42:34828] helo=mail-oi0-f42.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 27/61-60695-2F247D75 for <internals@lists.php.net>; Mon, 12 Sep 2016 20:06:11 -0400
Received: by mail-oi0-f42.google.com with SMTP id d191so129582838oih.2
        for <internals@lists.php.net>; Mon, 12 Sep 2016 17:06:10 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:mime-version:in-reply-to:references:from:date
         :message-id:subject:to:cc;
        bh=nJd1vMi+zfDaZXxPYdBhfpIH/HYqJE4X9Vjoe+z+nIM=;
        b=LaS9+F4bQTEwqkPVTcOeoXM6cv1v5rrpk5zvwcLYjVz8MnF22Wtmx4ErXhQhZntbJw
         q6orXELFXxMYZSBs7x6EixO4RR1AlS3SJU46WsPKLu+MPYxlizIBTQRImfmauDUJ067Z
         x73CSKfVz5/kqLOBV0WEmuJQSAgzkrU8qbSJxj/tFQEoTa8YWoBSUXts5c8nT11tMT1Y
         wVh/PoZsYSv6vhOiUVe+2ZdYzYxsOJb5gv3XAtlfuAXEsgTq3HGlh7xEhsEUW5dz037F
         zgTF3hXmupyetWoIzRjVkGzl7QRFrkQzhiVXE18hD9vZqGy8EUEmqk//PCT1GdgV5WFi
         qoaQ==
X-Gm-Message-State: AE9vXwNBaxAchCay7jjY3OwWNBRqr5y26GmPTNY2P8kYwGlUMa34Ah/OotlpaGzrBihTSQ==
X-Received: by 10.157.3.108 with SMTP id 99mr16183865otv.71.1473725168142;
        Mon, 12 Sep 2016 17:06:08 -0700 (PDT)
Received: from mail-oi0-f49.google.com (mail-oi0-f49.google.com. [209.85.218.49])
        by smtp.gmail.com with ESMTPSA id f2sm6945115oih.18.2016.09.12.17.06.07
        for <internals@lists.php.net>
        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Mon, 12 Sep 2016 17:06:07 -0700 (PDT)
Received: by mail-oi0-f49.google.com with SMTP id d191so129581742oih.2
        for <internals@lists.php.net>; Mon, 12 Sep 2016 17:06:07 -0700 (PDT)
X-Received: by 10.157.57.134 with SMTP id y6mr24004302otb.94.1473725167412;
 Mon, 12 Sep 2016 17:06:07 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.64.125.133 with HTTP; Mon, 12 Sep 2016 17:06:06 -0700 (PDT)
Received: by 10.64.125.133 with HTTP; Mon, 12 Sep 2016 17:06:06 -0700 (PDT)
In-Reply-To: <004101d20d46$a40be340$ec23a9c0$@belski.net>
References: <CADxrgCPPWyVqSRqTzjTTh-Zy5CDYP7ws==dj03qNuk7yDDZNkA@mail.gmail.com>
 <004101d20d46$a40be340$ec23a9c0$@belski.net>
Date: Mon, 12 Sep 2016 20:06:06 -0400
X-Gmail-Original-Message-ID: <CADxrgCM9Wt08ftUY7MYutzmeibKCEeFc0JVtUwa6-d_PDJ2Pzg@mail.gmail.com>
Message-ID: <CADxrgCM9Wt08ftUY7MYutzmeibKCEeFc0JVtUwa6-d_PDJ2Pzg@mail.gmail.com>
To: Anatol Belski <anatol.php@belski.net>
Cc: internals@lists.php.net
Content-Type: multipart/alternative; boundary=001a1141a31819b12b053c58617c
Subject: RE: [PHP-DEV] merged branches in incorrect order
From: adambaratz@php.net (Adam Baratz)

--001a1141a31819b12b053c58617c
Content-Type: text/plain; charset=UTF-8

> To keep it clean, you can
>
> 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.

Yes, but in this case, I'd already pushed.

--001a1141a31819b12b053c58617c--