From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Albinus 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 12:05:22 +0200 Message-ID: <878uc93tlp.fsf@gmx.de> References: <20150527165006.32357.80915@vcs.savannah.gnu.org> <87egm13yrm.fsf@gmx.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1432807544 16503 80.91.229.3 (28 May 2015 10:05:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 May 2015 10:05:44 +0000 (UTC) Cc: emacs-devel To: Artur Malabarba Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 28 12:05:36 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 1Yxugy-0001qc-JM for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 12:05:36 +0200 Original-Received: from localhost ([::1]:57513 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxugx-0003F4-Qk for ged-emacs-devel@m.gmane.org; Thu, 28 May 2015 06:05:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxugr-0003AE-87 for emacs-devel@gnu.org; Thu, 28 May 2015 06:05:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yxugm-0006sQ-UU for emacs-devel@gnu.org; Thu, 28 May 2015 06:05:29 -0400 Original-Received: from mout.gmx.net ([212.227.15.15]:57067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yxugm-0006s9-Jw for emacs-devel@gnu.org; Thu, 28 May 2015 06:05:24 -0400 Original-Received: from detlef.gmx.de ([93.209.72.49]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0MPDeK-1Z2KXb1PZw-004PyD; Thu, 28 May 2015 12:05:23 +0200 In-Reply-To: (Artur Malabarba's message of "Thu, 28 May 2015 10:27:15 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-Provags-ID: V03:K0:5HVqr3i5XWUwl5eIuc08BnE4UkH2VR8Ki1P0VE6bAZahrjz9ZuC DKGlLI8NT3cgI8VzaE4zaOe/kQTslfYJo6JmFShjX3Ji5nUjFAyjLfX+ZkR2UkZdpb3RWHR CeE46GuKI/lhRxFESHBIIW+QV1hWolzshQ1gFEmYaM0fdbhLRNI00VyjIKchq/9c7LNbAuS THJZqf5YqSebFe9sHixAg== X-UI-Out-Filterresults: notjunk:1;V01:K0:OcFb0ZCH6Ww=:DyUW+tmjKPL+9XxK7KiUym VmihVy5+ZGGDfihL7O6rJ1MmpM/aMCEibZ0FAqj2nA8CRW9NW2H1NI+tEy3IdiMSaUsKdK4Qk QY5WdiOrKQtsLPf+5XD9cBbwJjHC2hmbS7GjKKVGT2H4M/2KiIJp9PIljNB2inKHHXrROpK2b 3J4QCWL6tf2rY1loTaKsj1T/P5Kg6LXigqSYjZ1GIgPcA85Hki5SKU12R3cFcqs8paU40zAhI 5TP+qKmWOyUB0+JKbZaLoWXBcpFMetQpJBYqa10vZh6TcqfC1tXm9mJHm0hxQmfgwbKat7RIS 956wGuxM94QQKlznev1fN952YU7QOmi8OT3TzAQfaf4u4zcBuX0HPQbukJm6KvBIxkqUUaOmB 8iwDHLWbhBvmCOOemNfyezmObsP2vhFjBzQbpD+7088IckSXno/v5Ihp/kx4yuT7ZeNWSX5LX UkmhA2emVVGU1ULSLyBhlKyUjbF49yXMMb26yLWqnatH1OUGB3eMIjrYSsXhB/k6f8f0QLGfz 3XxIpvc0b7MTwb6rPFhxSjSX5fdh3+QgNpA6VpKXEhTYg3Yma0LutLs04+3Ff54Vcacbpi/0p IMM394m7Z4V7dXCUz3hTqPSjdg5AMfMZO09oUz9NlN3s+iSWPsFv4PdK/AUxsSxK3kglgFohz cYdib2c1DVp4eYwxTBD+xlIvIgoinlmcmCML/uJlfVBjn6yzCEbbMKaNUOD9NOrq8Tto= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.15.15 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:186898 Archived-At: Artur Malabarba writes: > 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. Thanks. Will try it. Best regards, Michael.