From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 20:48:53 +0100 Message-ID: References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <54CE05A0.2090701@cs.ucla.edu> <54CE4FB9.1060800@yandex.ru> <54CE54A6.1000606@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422820181 28885 80.91.229.3 (1 Feb 2015 19:49:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 19:49:41 +0000 (UTC) Cc: Paul Eggert , emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 20:49:41 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 1YI0Wa-0000xg-F3 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 20:49:40 +0100 Original-Received: from localhost ([::1]:51718 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0WZ-0007zO-G6 for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 14:49:39 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0WL-0007z6-9d for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:49:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI0WG-0000PY-A9 for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:49:25 -0500 Original-Received: from mx1.bahnhof.se ([213.80.101.11]:33574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0WG-0000On-3s for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:49:20 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx1-reinject (Postfix) with ESMTP id A840A40983; Sun, 1 Feb 2015 20:49:18 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF4) Original-Received: from mf4.bahnhof.se ([127.0.0.1]) by localhost (mf4.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4+r+CKNxLqxB; Sun, 1 Feb 2015 20:49:13 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf4.bahnhof.se (Postfix) with ESMTP id DAF4A3D787D; Sun, 1 Feb 2015 20:49:12 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 58D1F52B4BE; Sun, 1 Feb 2015 19:49:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at verona.se Original-Received: from mta.verona.se ([127.0.0.1]) by localhost (exodia.verona.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KWnQYKrnMaiB; Sun, 1 Feb 2015 20:48:54 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id F22D652B4B1; Sun, 1 Feb 2015 20:48:53 +0100 (CET) In-Reply-To: <54CE54A6.1000606@yandex.ru> (Dmitry Gutov's message of "Sun, 01 Feb 2015 18:30:30 +0200") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 213.80.101.11 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:182207 Archived-At: Dmitry Gutov writes: > On 02/01/2015 06:17 PM, joakim@verona.se wrote: >> But wouldnt the xwidget branch still be in master then? > > Note the "check out the last master before the merge" step. That would > be commit a2c32b0. Ok, so I tried following your recipy, withouth really understanding why it would help. So I did: git checkout -b master_xwfix a2c32b0 git rebase master_xwfix ... here I got into a series of conflict fixes. Since the commit scripts are more scrupulous now, there are many whitespace conflicts and so on, and when I got to a too long commit message conflict, I decided I'm probbly doing something wrong. Is there some other way to revert the merge? I would like to revert, fix up the branch according to the various advice I've gotten, and only then re-attempt a merge. -- Joakim Verona