From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs Date: Thu, 28 May 2015 10:27:15 +0100 Message-ID: References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1432805260 10769 80.91.229.3 (28 May 2015 09:27:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 09:27:40 +0000 (UTC) Cc: emacs-devel To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 11:27:25 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Yxu5y-0003au-Af for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 11:27:22 +0200 Original-Received: from localhost ([::1]:57377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxu5x-00076F-C1 for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 05:27:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41061) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxu5u-00075z-8n for emacs-devel@gnu.org; Thu, 28 May 2015 05:27:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxu5t-0001hX-Db for emacs-devel@gnu.org; Thu, 28 May 2015 05:27:18 -0400 Original-Received: from mail-lb0-x231.google.com ([2a00:1450:4010:c04::231]:33492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxu5t-0001hE-4l for emacs-devel@gnu.org; Thu, 28 May 2015 05:27:17 -0400 Original-Received: by lbcue7 with SMTP id ue7so24200531lbc.0 for ; Thu, 28 May 2015 02:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=xscFDHPCe2WSc9Z61A5SF4mRYsbtaiXWKIpLkYPdGZ0=; b=cjYbyJJrojUQRXHSrwMDaegqCto+QWXOzRZleLnYjuQEZbokKcAjXsVqXYyqkU/w66 fOTUzIxnxgYAVZiRJnDdVd2zRdElSz1fjRBvXsHxIoFhfxoYw6IlwGQhIjfDm4X+QGuZ WXb2r6u2sR9ga0tqK5e5uPTXW+lkdT6ZkCk3O6otU1QAQueYO1S4o9M5As6RU5ecBJkp SCLIjfoBuhQjDAnpoImi121iVnnQhgPoIdzxXj+C2SnLxVJVoJewQ55kB8SifgeDL6/0 0axNtBvfICXPmZnytM+Ed8v8DVwR0x1dbiUIfpLAvCqAAbVecye2qhdP5ZH6TKMZsrZD l1Pg== X-Received: by 10.112.204.6 with SMTP id ku6mr1773783lbc.73.1432805235367; Thu, 28 May 2015 02:27:15 -0700 (PDT) Original-Received: by 10.25.150.1 with HTTP; Thu, 28 May 2015 02:27:15 -0700 (PDT) In-Reply-To: <87egm13yrm.fsf@gmx.de> X-Google-Sender-Auth: YDmFENRgzyXxNd2vVfkpu9BcMug X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::231 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:186897 Archived-At: > - I've pulled from the remote Emacs repository, getting a conflict in > tramp.el. Glenn had fixed the problem already, but there are > whitespace difference between his and my change. > > - I've fixed the conflict in tramp.el, and committed it. As a general tip. Next time you try to pull and find out someone already has already done what you just did, don't resolve the merge conflict. Instead, abort the merge with `git merge --abort` (this will get you back to the state you had right before the pull), and then locally revert your commit.