Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:95957 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 60589 invoked from network); 12 Sep 2016 22:00:11 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 12 Sep 2016 22:00:11 -0000 Authentication-Results: pb1.pair.com smtp.mail=smalyshev@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=smalyshev@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.192.196 as permitted sender) X-PHP-List-Original-Sender: smalyshev@gmail.com X-Host-Fingerprint: 209.85.192.196 mail-pf0-f196.google.com Received: from [209.85.192.196] ([209.85.192.196:36808] helo=mail-pf0-f196.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 70/71-51547-66527D75 for ; Mon, 12 Sep 2016 18:00:10 -0400 Received: by mail-pf0-f196.google.com with SMTP id x24so8626761pfa.3 for ; Mon, 12 Sep 2016 15:00:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=Saw7ykN4DiD8d0kHO+ml5UMpom9Uk54S+E1hks/m2gA=; b=Mv2l5cr+PhwSwKtClWZLoR9fsysqF6tDIbaWWouZq/zknrNjzrHreCACkK39gNqClI sE5xdd2KBjDZ1EDY3Rcv9OOWhvwN0c0PPN1PtSKzqYJXgByATEouPprmMDPJNd4nttNA Lftfv6B+kxShLspUkb/GEBxPpch6UcJjEAhkFbvaPNwSZFSLunKvGs43HIu3+wdTb3gh es1DwvktZxKMq24uZN5AyQ8peAaOhmNTYuAqBeISdIMyg8UuYtJzb1jeWEo6acQCh+wX xmoPOvm04cAN8qUkV4LDBKmwu10z9/ucgQelM9lih/PgEzTA7JnBVxjqAZkQ8nbWPA0h FvUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=Saw7ykN4DiD8d0kHO+ml5UMpom9Uk54S+E1hks/m2gA=; b=FW+6hc2OoKe9WCkwa1mk0GxR+cr9AF0Ioko72gSTn1lXluAxIyHx5K+La7Ti4ZHQgd 9Rj7ifq3qGoLovaRv/12ic6YZJpUrM3zzXewNI/cit1NnhiZ4YJHAP8P7FqIPWa6hTho tlaIOdD2eMWcicbnun5xwFya3gNI4NRnrZVd2U/oDqn9hBfDrH2SPq3/6DIOTU0w4oh3 LlUJV+C1CagYpg4/sAnNdQtAHWjrZie2fhSWEdmCpvvvAN7LvA/F/S7ylTtT/TqFFoPc 114ejZrpVyi8hONnRFSjw2mF7rCP/Nndf6/PB5rPuTKUonqzTwWnAXwsJXIt7Xh8W2cQ FomA== X-Gm-Message-State: AE9vXwNXlCm+zhbTJlcZfDfMf9cEpOqu+9hA009rqO2/La/5jqv3fHOiyIbcGMVeKJ7wrw== X-Received: by 10.98.112.135 with SMTP id l129mr21970294pfc.149.1473717601112; Mon, 12 Sep 2016 15:00:01 -0700 (PDT) Received: from Stas-Air.local (108-233-206-104.lightspeed.sntcca.sbcglobal.net. [108.233.206.104]) by smtp.gmail.com with ESMTPSA id ah5sm26697208pad.30.2016.09.12.15.00.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Sep 2016 15:00:00 -0700 (PDT) To: Adam Baratz , "internals@lists.php.net" References: Message-ID: <06a56878-e04b-222c-86be-19517cfc7d50@gmail.com> Date: Mon, 12 Sep 2016 14:59:59 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] merged branches in incorrect order From: smalyshev@gmail.com (Stanislav Malyshev) Hi! On 9/12/16 2:53 PM, Adam Baratz wrote: > 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. As long as you merge up (7.0->7.1, 7.1->master) it's fine. Correct order is 7.0->7.1->master but if you did 7.0->master once it's no big deal. Main thing is to never merge down (master->7.0), that would mess up a lot of things. -- Stas Malyshev smalyshev@gmail.com