On 8 September 2010 15:27, byrnejb <byrn...@harte-lyne.ca> wrote:
>
> I have two branches, master and working.  The .gitignore file has this
> entry:
>
> config/database.yml
>
> When I checkout working I see this:
>
> -rw-rw-r-- 1 x y 1196 Sep  8 09:23 config/database.yml
>
> When I co master I see this:
>
> ls: config/database.yml: No such file or directory
>
> If I add config/database.yml while in master and switch to working and
> then back again the file disappears.  Evidently I have done something
> to git that causes it to remove the file whenever the master branch is
> switched but I cannot fathom what that could be.   Does anyone have
> any ideas what this might be and how to correct it?

It sounds as you have the ,gitignore file only on the master branch
and not on the working branch, so git doesn't know that it should
leave config/database.yml alone when it changes branches.

-- Øyvind

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to