From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.devel Subject: Re: Trouble merging line-numbers branch into master Date: Fri, 07 Jul 2017 18:08:57 +0000 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a11401e543218210553be2161" X-Trace: blaine.gmane.org 1499453214 8030 195.159.176.226 (7 Jul 2017 18:46:54 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 7 Jul 2017 18:46:54 +0000 (UTC) Cc: Emacs developers To: Noam Postavsky Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 07 20:46:50 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTYH7-0001eq-Pm for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 20:46:45 +0200 Original-Received: from localhost ([::1]:58350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTYHD-0006Wk-7i for ged-emacs-devel@m.gmane.org; Fri, 07 Jul 2017 14:46:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dTXgn-0008Go-S0 for emacs-devel@gnu.org; Fri, 07 Jul 2017 14:09:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dTXgm-00016H-RI for emacs-devel@gnu.org; Fri, 07 Jul 2017 14:09:13 -0400 Original-Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]:36290) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dTXgm-00014v-K4 for emacs-devel@gnu.org; Fri, 07 Jul 2017 14:09:12 -0400 Original-Received: by mail-lf0-x22b.google.com with SMTP id h22so29564223lfk.3 for ; Fri, 07 Jul 2017 11:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Io1I/VS9KdA57uaBMimwMhyv3bNdvMYAV7o1x2ZPW4E=; b=d5PXkSQL7pVtB0FBteO9fbbnYiji+9xXe3nev9uva7z/5ky2eyTsD1A1zm7sOkwEzu H9OHhUHZA01+8Ar1HcvRPWJsn8vjy9HF7hOT9E0zUMsAPrSCHpVxBSA01PVrrnRnVUP3 bcyV/QcDf7e4Zt1uXdyAVgRm8Y6PVZou4xOIKU0XESwPVbPPZy72DVFw95LFInz3vLuj F9V14FZp96/o3uv5NEG6SSubyixrXCrgy9we3G0Z/mP9Rj2+EXn7ypyQAom3RmydqMKR BrguKeF5TzsCSjatbtQA9+ErAABiomhLRPRZCeYDW6df4C0T346uGq0O28bqLyrX10QX JZGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Io1I/VS9KdA57uaBMimwMhyv3bNdvMYAV7o1x2ZPW4E=; b=npIzjXM6IVz5uULF8NJ5SkfA9gChtAH7h6Pe85Ka6Ae1x6Jkn+XbqWn652RqgftWEW NctUKIx1rFg5ftaLkyE5wUhwWyoA+5KnJsek+Oybzf9q7WbMzEFzN5SgiskEzL1VayJf tk4s9S2BWWfsIuCsunS+6LMfiwn7dKYnx964ofYbP7yrWz5NFRjEf64xesqyh5okEbLn VSNS00AXHN1utzvIaw3M8awFe5ShGBj7APIND2BGmWddc7TjYw3QN86NqB4Eext10a+W 0mh0v0ZXRMHIhvGj6YCZ279Sg8Old2TzqgZ8y6CV3BCFOl7NP2FOvjXlNE79gpXXj4it nzvw== X-Gm-Message-State: AKS2vOy+eW0/+HtXaoO52qACqPfeDgJ0i3GzZJdtfUlQcjId7vKAI4kr xsndms6s86DlXy2frRyjrCPQYrAyyQ== X-Received: by 10.25.157.202 with SMTP id g193mr19570696lfe.27.1499450949374; Fri, 07 Jul 2017 11:09:09 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:216285 Archived-At: --001a11401e543218210553be2161 Content-Type: text/plain; charset="UTF-8" On Fri, Jul 7, 2017 at 11:51 AM Noam Postavsky < npostavs@users.sourceforge.net> wrote: > If you rerun './autogen git' in a checkout which includes [1: > e20ad44], the git hook should be updated such that it won't complain > about changes from merged commits anymore. > > 1: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678 > Allow bypassing of some checks when merging > Thanks! Soon after I emailed, I was able to get past that problem by committing the fix that removed those spaces in my local master and then restarting the merge. -- Kaushal Modi --001a11401e543218210553be2161 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Jul 7,= 2017 at 11:51 AM Noam Postavsky <npostavs@users.sourceforge.net> wrote:
If you rerun './autogen git' in a checkout w= hich includes [1:
e20ad44], the git hook should be updated such that it won't complain about changes from merged commits anymore.

1: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678
=C2=A0 Allow bypassing of some checks when merging
Thanks!

Soon after I emailed, I was ab= le to get past that problem by committing the fix that removed those spaces= in my local master and then restarting the merge.
--

Kaushal Modi

--001a11401e543218210553be2161--