{"thread":{"id":"20160","subject":"Pulled files with \"new file\" status","startedAt":"2009-07-20T05:45:27Z","lastAt":"2009-07-20T07:40:03Z","messageCount":2,"participants":["Marcelo de Moraes Serpa","Johannes Sixt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"118279","messageId":"1e5bcefd0907192245j19aac1aar804a0e3bd637b46b@mail.gmail.com","threadId":"20160","inReplyTo":null,"subject":"Pulled files with \"new file\" status","fromName":"Marcelo de Moraes Serpa","fromEmail":"celoserpa@gmail.com","sentAt":"2009-07-20T05:45:27Z","receivedAt":"2009-07-20T05:45:27Z","isPatch":false,"sender":{"key":"celoserpa@gmail.com","avatar":null},"body":"Hello,\n\nI just went through an interesting situation and maybe someone could\nenlighten-me. I pulled and got a conflict. I solved the conflict, git\nadded the file, and committed. I git pulled again and get the updates\nfrom a friend, but the intriguing thing is that, the files that he\nadded appeared as \"new file\" for me too. Why's that? I haven't been\nthe one who added the file, he added it, why git would pull objects\nand tell me they are new ?\n\nThanks in advance!\n\nMarcelo.\n"},{"id":"118288","messageId":"4A641F53.9010901@viscovery.net","threadId":"20160","inReplyTo":"1e5bcefd0907192245j19aac1aar804a0e3bd637b46b@mail.gmail.com","subject":"Re: Pulled files with \"new file\" status","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-07-20T07:40:03Z","receivedAt":"2009-07-20T07:40:03Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Marcelo de Moraes Serpa schrieb:\n> I git pulled again and get the updates\n> from a friend, but the intriguing thing is that, the files that he\n> added appeared as \"new file\" for me too. Why's that? I haven't been\n> the one who added the file, he added it, why git would pull objects\n> and tell me they are new ?\n\nPerhaps because they *are* new for you?\n\n  ------Y--M    <-- you\n          /\n   ------F      <-- your friend\n\nIf F added files, then you pull F, which creates the merge commit M, then\nthe files are also new for *you*.\n\nI assume you were looking at the diff summary that 'git pull' reported.\nThis diff is the difference from Y to M, and in that diff, the files *are*\nnew because they are now in M, but not in Y.\n\n-- Hannes\n"}]}