From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
To: Johannes Sixt <j.sixt@viscovery.net>, git@vger.kernel.org
Subject: Re: .gitignore vs untracked working file
Date: Mon, 10 Aug 2009 15:49:39 +0200 [thread overview]
Message-ID: <286817520908100649j4d369a10p22c667ee077daa47@mail.gmail.com> (raw)
In-Reply-To: <4A801D48.3020902@viscovery.net>
> This is not only about ignored files, but untracked files. And the check
> is already there: git said:
>
> Untracked working tree file 'Project/bin/path/file.jjt' would be
> overwritten by merge.
Well the meaning of the error message is clear to you but it wasn't
for me. I simply would not ask if I knew how to correctly interpret
it. I hope I'll have a time to make a little improvement here...
Bost
PS: ...and you can reject it if you don't agree :-)
prev parent reply other threads:[~2009-08-10 13:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-10 9:57 .gitignore vs untracked working file Rostislav Svoboda
2009-08-10 10:01 ` Uwe Kleine-König
2009-08-10 10:17 ` Rostislav Svoboda
2009-08-10 11:41 ` Johannes Sixt
2009-08-10 12:59 ` Rostislav Svoboda
2009-08-10 13:14 ` Johannes Sixt
2009-08-10 13:49 ` Rostislav Svoboda [this message]
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=286817520908100649j4d369a10p22c667ee077daa47@mail.gmail.com \
--to=rostislav.svoboda@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/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 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 NNTP newsgroup(s).