From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
To: git@vger.kernel.org, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Subject: Re: .gitignore vs untracked working file
Date: Mon, 10 Aug 2009 12:17:02 +0200 [thread overview]
Message-ID: <286817520908100317k4e98faf9n4e852b7abd4719fe@mail.gmail.com> (raw)
In-Reply-To: <20090810100148.GB22200@pengutronix.de>
2009/8/10 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
> Hello,
>
>> $ git checkout master
>> error: Untracked working tree file 'Project/bin/path/file.jjt' would
>> be overwritten by merge.
> What is the output of
>
> $ git ls-files master bin/
Nothing:
$ git ls-files master bin/
$ git ls-files master Project/bin/
$ git ls-files mybranch bin/
$ git ls-files mybranch Project/bin/
$ ll 'Project/bin/path/file.jjt'
-rw-r--r-- 1 bost Administ 8233 May 10 2006 Project/bin/path/file.jjt
$ git ls-files ''Project/bin/path/file.jjt'
BTW the rule to ignore bin/ is exclusively in the .gitignore on the
branch mybranch not in the master branch. Might this be the problem?
Bost
next prev parent reply other threads:[~2009-08-10 10:17 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 [this message]
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
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=286817520908100317k4e98faf9n4e852b7abd4719fe@mail.gmail.com \
--to=rostislav.svoboda@gmail.com \
--cc=git@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
/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).