From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Aghiles <aghilesk@gmail.com>, Matthieu Moy <Matthieu.Moy@imag.fr>,
Nicolas Sebrecht <nicolas.s.dev@gmx.fr>,
Thomas Rast <trast@student.ethz.ch>,
git list <git@vger.kernel.org>
Subject: Re: git pull suggestion
Date: Fri, 09 Apr 2010 21:40:59 -0700 [thread overview]
Message-ID: <7vochrzzqc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20100410043535.GA22481@coredump.intra.peff.net> (Jeff King's message of "Sat\, 10 Apr 2010 00\:35\:35 -0400")
Jeff King <peff@peff.net> writes:
> Your local changes to '%s' would be overwritten by merge. Aborting.
> Please, commit your changes or stash them before you can merge.
>
> What version of git are you using? If you (or others you are helping)
> saw that message and it wasn't helpful, do you have any suggestions for
> how to improve it?
I use 1.7.1-rc0 myself, but dropping comma after "Please" may make it a
bit easier to read IMHO ;-).
next prev parent reply other threads:[~2010-04-10 4:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-07 23:17 git pull suggestion Aghiles
2010-04-08 15:54 ` Thomas Rast
2010-04-08 19:33 ` Aghiles
2010-04-08 23:11 ` Nicolas Sebrecht
2010-04-09 3:06 ` Aghiles
2010-04-09 3:49 ` Jeff King
2010-04-09 19:33 ` Aghiles
2010-04-10 4:35 ` Jeff King
2010-04-10 4:40 ` Junio C Hamano [this message]
2010-04-11 6:01 ` Aghiles
2010-04-11 7:37 ` Junio C Hamano
2010-04-11 16:33 ` Matthieu Moy
2010-04-12 20:18 ` Aghiles
2010-04-12 21:35 ` Junio C Hamano
2010-04-09 20:54 ` Aghiles
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=7vochrzzqc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@imag.fr \
--cc=aghilesk@gmail.com \
--cc=git@vger.kernel.org \
--cc=nicolas.s.dev@gmx.fr \
--cc=peff@peff.net \
--cc=trast@student.ethz.ch \
/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.
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.