Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:95956 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 59029 invoked from network); 12 Sep 2016 21:53:40 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 12 Sep 2016 21:53:40 -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.52 as permitted sender) X-PHP-List-Original-Sender: adam.baratz@gmail.com X-Host-Fingerprint: 209.85.218.52 mail-oi0-f52.google.com Received: from [209.85.218.52] ([209.85.218.52:33416] helo=mail-oi0-f52.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id AB/11-51547-1E327D75 for ; Mon, 12 Sep 2016 17:53:37 -0400 Received: by mail-oi0-f52.google.com with SMTP id y2so338856085oie.0 for ; Mon, 12 Sep 2016 14:53:37 -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:from:date:message-id:subject:to; bh=FdS4YRyKiIwVLQ5gxLquSSflUgSa1Bx5Pc+RR8XwQQs=; b=hxGD8k4MeZpIGnuIVmlHWo3zqjAavd99kcBCHvlSgmWSC4C+qpiChN2pBPzpKi6uEI EryFW47XO1i5/Lyf/mMOJ9kf2WDbAgObQym/sEPKjoptG+eOzpH0+0QwQ8SIakbr7az9 6Nn9eESq3+UJoUY2/u4wEUwzZkWxBarIEi8sySjWTXbaKh1nxsXw0oAh4btDtDgniHgy y/3aZEHMZrgkzjuHGoDQ5Vr/iHFPqP++MJuYd1f2KepowCEcL27ct5yRcBd7YmyWD9mK EToZJ5HXX5zVgrqKUp+5MfCBUf+sueE0k716k5OJDdcR4Ftv8Xh23OHnwpJlRYzzoKFT A2Yw== X-Gm-Message-State: AE9vXwN5CWlMGVtZ39JIEpbiSVKRPTm7uZrm4BQoZ9oiW9t3iSLBZ5hAgPI2W1pQ8gOpYw== X-Received: by 10.202.74.78 with SMTP id x75mr1776278oia.77.1473717214303; Mon, 12 Sep 2016 14:53:34 -0700 (PDT) Received: from mail-it0-f43.google.com (mail-it0-f43.google.com. [209.85.214.43]) by smtp.gmail.com with ESMTPSA id b133sm792542iti.21.2016.09.12.14.53.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 14:53:34 -0700 (PDT) Received: by mail-it0-f43.google.com with SMTP id x192so7098990itb.0 for ; Mon, 12 Sep 2016 14:53:33 -0700 (PDT) X-Received: by 10.157.16.100 with SMTP id o33mr28889359oto.50.1473717213675; Mon, 12 Sep 2016 14:53:33 -0700 (PDT) MIME-Version: 1.0 Received: by 10.64.125.133 with HTTP; Mon, 12 Sep 2016 14:53:33 -0700 (PDT) Date: Mon, 12 Sep 2016 17:53:33 -0400 X-Gmail-Original-Message-ID: Message-ID: To: "internals@lists.php.net" Content-Type: multipart/alternative; boundary=001a1134fd26054ec0053c5687e0 Subject: merged branches in incorrect order From: adambaratz@php.net (Adam Baratz) --001a1134fd26054ec0053c5687e0 Content-Type: text/plain; charset=UTF-8 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. Thanks, Adam --001a1134fd26054ec0053c5687e0--