Hello, I just went through an interesting situation and maybe someone could enlighten-me. I pulled and got a conflict. I solved the conflict, git added the file, and committed. I git pulled again and get the updates from a friend, but the intriguing thing is that, the files that he added appeared as "new file" for me too. Why's that? I haven't been the one who added the file, he added it, why git would pull objects and tell me they are new ? Thanks in advance! Marcelo. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html