From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: Merge conflicts Date: Mon, 4 Oct 2021 17:26:49 +0200 Message-ID: References: <4lr1d0rf16.fsf@fencepost.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37430"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 04 17:28:21 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mXPt6-0009Wn-9o for ged-emacs-devel@m.gmane-mx.org; Mon, 04 Oct 2021 17:28:20 +0200 Original-Received: from localhost ([::1]:34856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXPt4-0004qL-Cu for ged-emacs-devel@m.gmane-mx.org; Mon, 04 Oct 2021 11:28:18 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXPrr-000437-TR for emacs-devel@gnu.org; Mon, 04 Oct 2021 11:27:03 -0400 Original-Received: from mail-pj1-f52.google.com ([209.85.216.52]:37856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXPrq-0004r0-H4; Mon, 04 Oct 2021 11:27:03 -0400 Original-Received: by mail-pj1-f52.google.com with SMTP id me5-20020a17090b17c500b0019af76b7bb4so4750029pjb.2; Mon, 04 Oct 2021 08:27:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=snjqa5mKa2UUjobooUwOc/w3m3fd1hr3okGtgt3h2ys=; b=oHK8mS8sTj71FzelJLFBx0tdmS15mfOHQn5xwCEWMy2iRfjkI2Upnu2sTnQCqTZ9jJ DY69W+R7HrJkuZxHnjOz6UPAIBDNEDg73bI0aCYWqjDyOge/5pNkMHmN4aAxqeEcx0/E EJSI/Ic/Oop70Uunq6frTEe5tkgTiAQh7332Xvn4jZoGeHejXOnNWcGxbCdQbCcIROQO pi5Z3PnKe+xhGWokwFd1TfdXPm4yDpWccNEn8hhrx9WB+7ny6K7QXVKCBUi1LoXwLW+I dwudbKpgO3nxsiSmwYoBNIEMiXAXl6SfquZN0zbQ+teMiQy606gh/9i4Z2J83tCAdm57 7KtA== X-Gm-Message-State: AOAM532yZPf7UU+G0Vr0FQyq+dj38QnaoeoGOQZfqoVqcPRD6p7mEECU q5Fe3DOylL/cWnMx3MqzZPPRzG1yBYWHH5knsiRXJ6EP X-Google-Smtp-Source: ABdhPJwJ358snjV2t4gPgFOpAJ5UG3DHnc9fbEScIPy7gRMdW/hoRlxVuxsVA3WLkc/pvNT40hMlgZX3WUuDDNyX6pU= X-Received: by 2002:a17:90a:460a:: with SMTP id w10mr37517195pjg.132.1633361220713; Mon, 04 Oct 2021 08:27:00 -0700 (PDT) In-Reply-To: <4lr1d0rf16.fsf@fencepost.gnu.org> Received-SPF: pass client-ip=209.85.216.52; envelope-from=stefankangas@gmail.com; helo=mail-pj1-f52.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:276214 Archived-At: Glenn Morris writes: > The emacs-28 branch is already accruing merge conflicts against master, > which is a bit depressing. Please think about these things if you are > changing the same file on both branches. Eg remember to write > "do not merge to master" in the log when appropriate (ef6c43b896?). Thank you for the reminder, and many thanks for doing these merges.