From: Ingo Lohmar <i.lohmar@gmail.com>
To: Alan Mackenzie <acm@muc.de>, Paul Eggert <eggert@cs.ucla.edu>
Cc: Kaushal Modi <kaushal.modi@gmail.com>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Understanding a recent commit in emacs-25 branch [ed19f2]
Date: Sun, 03 Apr 2016 14:18:41 +0200 [thread overview]
Message-ID: <87egamevha.fsf@acer.localhost.com> (raw)
In-Reply-To: <20160403120300.GB3537@acm.fritz.box>
Hi Alan,
On Sun, Apr 03 2016 12:03 (+0000), Alan Mackenzie wrote:
>
> It was git that prepared the merge, not me. What happened was that the
> "more recent" commit 22443312... created a conflict with the commits in
> a git pull. git, rather than aborting the pull operation, splurged the
> contents of all the other commits in the pull into my working directory,
> saying "Conflict in .... You need to merge". I simply merged as
> directed.
>
> Is there a better way out of this situation than just merging as
> directed? Can one somehow get out of this partially completed git pull,
> then redo it with --rebase?
I am not Paul, but feel competent to answer this. You can 'git merge
--abort' to return to the previous state. Then you can 'git rebase
<where-to>', and <where-to> might be sth like 'origin/master'.
But you can avoid all this trouble by not doing 'git pull' in the first
place. Do 'git fetch --all', and then have a look at 'git log --graph'
as Dmitry suggested (gitk may or may not come with the git package you
use, but the information is essentially the same).
Hope this helps,
Ingo
next prev parent reply other threads:[~2016-04-03 12:18 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-01 5:32 Understanding a recent commit in emacs-25 branch [ed19f2] Kaushal Modi
2016-04-01 5:43 ` Kaushal Modi
2016-04-01 6:43 ` Paul Eggert
2016-04-03 12:03 ` Alan Mackenzie
2016-04-03 12:10 ` Achim Gratz
2016-04-03 14:18 ` Stefan Monnier
2016-04-03 14:49 ` Óscar Fuentes
2016-04-03 18:15 ` Achim Gratz
2016-04-03 18:45 ` Andreas Schwab
2016-04-03 18:56 ` Eli Zaretskii
2016-04-03 20:02 ` Paul Eggert
2016-04-03 21:15 ` Andreas Schwab
2016-04-03 23:11 ` John Wiegley
2016-04-03 12:18 ` Ingo Lohmar [this message]
2016-04-03 11:17 ` Alan Mackenzie
2016-04-03 11:27 ` Andreas Schwab
2016-04-03 11:40 ` Ingo Lohmar
2016-04-03 12:14 ` Alan Mackenzie
2016-04-03 12:30 ` Ingo Lohmar
2016-04-03 14:12 ` Andreas Schwab
2016-04-03 14:57 ` Ingo Lohmar
2016-04-03 15:08 ` Andreas Schwab
2016-04-03 15:12 ` Eli Zaretskii
2016-04-03 15:01 ` Eli Zaretskii
2016-04-03 15:23 ` Ingo Lohmar
2016-04-03 15:40 ` Eli Zaretskii
2016-04-03 16:00 ` Ingo Lohmar
2016-04-03 16:19 ` Eli Zaretskii
2016-04-03 16:24 ` Andreas Schwab
2016-04-03 17:09 ` Eli Zaretskii
2016-04-03 17:35 ` Andreas Schwab
2016-04-03 18:04 ` Eli Zaretskii
2016-04-03 11:44 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87egamevha.fsf@acer.localhost.com \
--to=i.lohmar@gmail.com \
--cc=acm@muc.de \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=kaushal.modi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).