From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Diane Gasselin <diane.gasselin@ensimag.imag.fr>
Cc: git@vger.kernel.org, "Axel Bonnet" <axel.bonnet@ensimag.imag.fr>,
"Clément Poulain" <clement.poulain@ensimag.imag.fr>
Subject: Re: [RFC/ PATCH 5/5] t7609: test merge and checkout error messages
Date: Wed, 09 Jun 2010 22:47:26 +0200 [thread overview]
Message-ID: <vpqtypcx7a9.fsf@bauges.imag.fr> (raw)
In-Reply-To: <1276087446-25112-7-git-send-email-diane.gasselin@ensimag.imag.fr> (Diane Gasselin's message of "Wed\, 9 Jun 2010 14\:44\:06 +0200")
Diane Gasselin <diane.gasselin@ensimag.imag.fr> writes:
> +error: Untracked working tree files:
> + five
> +would be overwritten by merge.
> +EOF
In my experience, newbies are often confused by this message (typical
example is students who don't believe me when I tell them not to
exchange files by email, getting untracked files from their co-workers
outside Git, and then trying to pull).
Perhaps this deserves an advice like the one we have for modified
files:
> +error: Your local changes to the files:
> + two
> + three
> + four
> +would be overwritten by merge.
> +Please, commit your changes or stash them before you can merge.
(also disabled by advice.commitBeforeMerge)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2010-06-09 20:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 12:44 [RFC/ PATCH 0/5] unpack_trees: nicer error messages Diane Gasselin
2010-06-09 12:44 ` Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 1/5] tree-walk: do not stop when an error is detected Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 2/5] unpack_trees: group errors by type Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 3/5] unpack_trees_options: update porcelain messages Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 4/5] t3030: update porcelain expected message Diane Gasselin
2010-06-09 12:44 ` [RFC/ PATCH 5/5] t7609: test merge and checkout error messages Diane Gasselin
2010-06-09 20:47 ` Matthieu Moy [this message]
2010-06-09 21:10 ` Diane Gasselin
2010-06-09 21:31 ` Matthieu Moy
2010-06-09 16:51 ` [RFC/ PATCH 4/5] t3030: update porcelain expected message Junio C Hamano
2010-06-09 20:40 ` Matthieu Moy
2010-06-10 1:59 ` Jeff King
2010-06-10 7:47 ` Diane Gasselin
2010-06-09 13:19 ` [RFC/ PATCH 2/5] unpack_trees: group errors by type Diane Gasselin
2010-06-09 16:50 ` Junio C Hamano
2010-06-10 9:21 ` Diane Gasselin
2010-06-09 20:59 ` Matthieu Moy
2010-06-09 16:49 ` [RFC/ PATCH 1/5] tree-walk: do not stop when an error is detected Junio C Hamano
2010-06-09 17:18 ` Diane Gasselin
2010-06-09 20:54 ` Matthieu Moy
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqtypcx7a9.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=axel.bonnet@ensimag.imag.fr \
--cc=clement.poulain@ensimag.imag.fr \
--cc=diane.gasselin@ensimag.imag.fr \
--cc=git@vger.kernel.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 public inbox
https://80x24.org/mirrors/git.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).