On Aug 26, 2013 10:46 PM, "dexter ietf" <dexter.i...@gmail.com> wrote:
>
> i thought this would be the cause and none of my commit
> has one/tgt tracked, i confirmed it by running 'git log'
> which doesn't list 'one/tgt' as a committed file. so i'm
> sure i haven't committed that file.

That means that if git overwrote it with the version from the other branch,
your uncommited version would be lost. Git tries to be very careful about
not losing your work like this.

-- 
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