Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:105733
Return-Path: <bishop.bettini@gmail.com>
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 76722 invoked from network); 17 May 2019 17:49:56 -0000
Received: from unknown (HELO mail-vs1-f52.google.com) (209.85.217.52)
  by pb1.pair.com with SMTP; 17 May 2019 17:49:56 -0000
Received: by mail-vs1-f52.google.com with SMTP id o5so4827632vsq.4
        for <internals@lists.php.net>; Fri, 17 May 2019 07:56:21 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:reply-to:from:date:message-id
         :subject:to;
        bh=CIj3ceGECLXz5dOC0H25Updmm9rtj7XQBMXokOzWAHY=;
        b=jjDCtZ/QDuIOhIqZiODEEbqCSPbBzFHfypzJZT4052OYjTxpa+N4D+8xhVnu4BOFWY
         i2B8QlYuw5V1pd6yaYwkbw3pr5Tqx9YbhgCe4aXfI6U6asP+E1NGDMPY6vTdCND66srp
         hW2DLrUIJi3g+zDUxxH9KZ+HCjFDm7S75RSlHaMftjofnBkvFPHCs7CVPQLGMPU5Yj2G
         iHUIsS7CeGFL1tStsEF7gX9baFLfI/9gQyscOPoNEwGVrvMMUTQ3qUaWTXZHKW7vbqDt
         rjxoWvIpKZCqBXVya5wlb5fx4DKP7LcDeCdXwrkG+xahct79l1oLchJdYWKg5RK5byeA
         ZSmg==
X-Gm-Message-State: APjAAAXnzGicOIkjIooRGAs6TCZz+orMl7o9RAMLTI2aO2NjIc/IYOx2
	BsyBqpzSBMS3kHQxoJZqlO2cLETq6OsZFZVFwPThdir1fms=
X-Google-Smtp-Source: APXvYqw/F5wPJssftUOTluZJpKhGJqvsBNo1FaCzM1mx46VYPc2TeRuXFf2N1P6vkatlghjKtHYHhTmFnEFgJqEqUSs=
X-Received: by 2002:a67:19c4:: with SMTP id 187mr1213357vsz.44.1558104980563;
 Fri, 17 May 2019 07:56:20 -0700 (PDT)
MIME-Version: 1.0
Reply-To: bishop@php.net
Date: Fri, 17 May 2019 10:55:54 -0400
Message-ID: <CAEYWF=69E9OBdYxf_-n-ih1C7P+6ZYKS9t3_gHvavRzC6PTztQ@mail.gmail.com>
To: PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="000000000000e3ab50058916954e"
Subject: Git FAQ - "How to handle changes that should not merge upward?"
From: bishop@php.net (Bishop Bettini)

--000000000000e3ab50058916954e
Content-Type: text/plain; charset="UTF-8"

Our Git FAQ[1] currently says (at the bottom):

> What about commits that should not be merged upwards (say, only for 5.3)?
Should you still merge them but make it so no changes actually take place?
Otherwise, it will the next person merging that will have to deal with the
conflict (or worse, the changes will be merged when they shouldn't have
been)

Please, could someone supply examples as to when this scenario occurs, and
how to handle it?

[1]: https://wiki.php.net/vcs/gitfaq

--000000000000e3ab50058916954e--