From: Rostislav Svoboda <rostislav.svoboda@gmail.com>
Date: Mon, 10 Aug 2009 13:49:39 GMT
Subject: Re: .gitignore vs untracked working file
Message-ID: <286817520908100649j4d369a10p22c667ee077daa47@mail.gmail.com>
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 :-)