I get the following error when doing a 'git pull'
i haven't touched the file 'one/tgt' nor committed
anything related to it, while checking it i found
that 'one/tgt' is an untracked file. why am i getting
this error for an untracked file, why does git care
about an untracked file and how do i get around it.

error: Entry 'one/tgt' would be overwritten by merge. Cannot merge.
fatal: merging of trees 4d147268c6e37117525b44272835e5a5c50091f5 and 
d90cf8aa21afc8d3847b792a2207ea9e3a9f96cf failed
Merge with strategy recursive failed.

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to