From: Alan Mackenzie <acm@muc.de>
To: Giuseppe Scrivano <gscrivano@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Stupid git!
Date: Sat, 12 Sep 2015 13:02:55 +0000 [thread overview]
Message-ID: <20150912130255.GF2322@acm.fritz.box> (raw)
In-Reply-To: <877fnvn9nh.fsf@foo.bar.baz>
Hello, Giuseppe.
On Sat, Sep 12, 2015 at 01:45:38PM +0200, Giuseppe Scrivano wrote:
> Alan Mackenzie <acm@muc.de> writes:
> > Hello, Emacs.
> >
> > git has struck again, and another couple of hours valuable time have
> > been lost.
> >
> > Having "staged" a change with `git add', I then tried to commit it with
> > `git commit'. Somebody else had got in before me, so I had to pull
> > their changes first - fair enough.
> >
> > So I did `git pull'. I was then dumped into an editing session for a
> > merge operation for .../test/automated/file-notify-tests.el. Eh? I've
> > never touched this file in my life, and didn't even know it existed. So
> > why is a merge necessary/why has a merge been (half-)done? Why didn't
> > git pull simply merge the changes to this file into my repository and
> > working directory?
> are you working and pulling on the same branch?
Yes.
> Have you used --rebase to pull to apply your commits after you pulled
> all the changes from the remote repository?
No, I didn't. I should have done. I don't think there are any
disadvantages to doing so.
> Regards,
> Giuseppe
--
Alan Mackenzie (Nuremberg, Germany).
next prev parent reply other threads:[~2015-09-12 13:02 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-12 10:15 Stupid git! Alan Mackenzie
2015-09-12 10:21 ` Alan Mackenzie
2015-09-12 10:40 ` Dmitry Gutov
2015-09-12 12:29 ` Alan Mackenzie
2015-09-12 12:34 ` David Kastrup
2015-09-12 12:59 ` Alan Mackenzie
2015-09-12 20:14 ` Dmitry Gutov
2015-09-14 10:09 ` Steinar Bang
2015-09-12 20:37 ` Stefan Monnier
2015-09-12 10:40 ` David Kastrup
2015-09-12 10:53 ` Dmitry Gutov
2015-09-12 12:52 ` Alan Mackenzie
2015-09-12 11:45 ` Giuseppe Scrivano
2015-09-12 13:02 ` Alan Mackenzie [this message]
2015-09-12 14:12 ` Andreas Schwab
2015-09-12 15:16 ` Eli Zaretskii
2015-09-12 20:36 ` Alan Mackenzie
2015-09-12 20:43 ` Dmitry Gutov
2015-09-12 21:51 ` Alan Mackenzie
2015-09-13 6:22 ` Sven Axelsson
2015-09-14 10:21 ` Alan Mackenzie
2015-09-14 10:29 ` David Kastrup
2015-09-14 12:19 ` Eli Zaretskii
2015-09-14 12:28 ` David Kastrup
2015-09-14 12:37 ` Eli Zaretskii
2015-09-14 12:47 ` David Kastrup
2015-09-14 13:38 ` Eli Zaretskii
2015-09-14 13:44 ` David Kastrup
2015-09-14 12:38 ` Stefan Monnier
2015-09-13 6:49 ` Eli Zaretskii
2015-09-14 10:49 ` Alan Mackenzie
2015-09-15 0:24 ` Stephen J. Turnbull
2015-09-13 20:28 ` Dmitry Gutov
2015-09-14 3:11 ` Stephen J. Turnbull
2015-09-14 13:47 ` Dmitry Gutov
2015-09-14 11:09 ` Alan Mackenzie
2015-09-14 12:22 ` Eli Zaretskii
2015-09-14 13:42 ` Dmitry Gutov
2015-09-14 17:05 ` Steinar Bang
2015-09-14 10:37 ` Steinar Bang
2015-09-13 6:42 ` Eli Zaretskii
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150912130255.GF2322@acm.fritz.box \
--to=acm@muc.de \
--cc=emacs-devel@gnu.org \
--cc=gscrivano@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.