{"thread":{"id":"37572","subject":"git merge --abort deletes unstaged files","startedAt":"2014-09-15T15:43:33Z","lastAt":"2014-09-15T22:28:33Z","messageCount":6,"participants":["André Hänsel","Andreas Schwab","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"249433","messageId":"04af01cfd0fb$d077e200$7167a600$@webkr.de","threadId":"37572","inReplyTo":null,"subject":"git merge --abort deletes unstaged files","fromName":"André Hänsel","fromEmail":"andre@webkr.de","sentAt":"2014-09-15T15:43:33Z","receivedAt":"2014-09-15T15:43:33Z","isPatch":false,"sender":{"key":"andre@webkr.de","avatar":null},"body":"As discussed in\nhttps://groups.google.com/forum/#!topic/git-users/uR7gzLL2Ovc:\n\nI ran git merge to merge a branch. There were some conflicted files.\nAlthough they were automatically resolved by git rerere, I still had to add\nthem. I accidentally ran \"git add .\" instead of \"git add -u\". I noticed my\nmistake and ran \"git merge --abort\" to start over. To my dismay all my\nuntracked files were gone.\n"},{"id":"249435","messageId":"87k354x0qt.fsf@igel.home","threadId":"37572","inReplyTo":"04af01cfd0fb$d077e200$7167a600$@webkr.de","subject":"Re: git merge --abort deletes unstaged files","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2014-09-15T17:16:42Z","receivedAt":"2014-09-15T17:16:42Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"André Hänsel writes:\n\n> I ran git merge to merge a branch. There were some conflicted files.\n> Although they were automatically resolved by git rerere, I still had to add\n> them.\n\nIf you want them to be added automatically, set rerere.autoupdate=true.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"249455","messageId":"xmqq61go65zu.fsf@gitster.dls.corp.google.com","threadId":"37572","inReplyTo":"87k354x0qt.fsf@igel.home","subject":"Re: git merge --abort deletes unstaged files","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-09-15T19:25:25Z","receivedAt":"2014-09-15T19:25:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andreas Schwab writes:\n\n> André Hänsel writes:\n>\n>> I ran git merge to merge a branch. There were some conflicted files.\n>> Although they were automatically resolved by git rerere, I still had to add\n>> them.\n>\n> If you want them to be added automatically, set rerere.autoupdate=true.\n\nI would have to caution against doing so without thinking, though.\nIn other words, it is OK if you are Andreas who knows what he is\ndoing, but it is not a very good advice to give to random newbies.\n\n\"rerere\" will apply whatever matching previous resolution, which may\nhopefully be the correct resolution this time too, but it is a good\nhabit to get into to double check if such a merely textual side-port\nof previous resolution is really applicable to the current conflict.\n"},{"id":"249463","messageId":"87iokolfc9.fsf@igel.home","threadId":"37572","inReplyTo":"xmqq61go65zu.fsf@gitster.dls.corp.google.com","subject":"Re: git merge --abort deletes unstaged files","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2014-09-15T21:54:30Z","receivedAt":"2014-09-15T21:54:30Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Junio C Hamano writes:\n\n> Andreas Schwab writes:\n>\n>> André Hänsel writes:\n>>\n>>> I ran git merge to merge a branch. There were some conflicted files.\n>>> Although they were automatically resolved by git rerere, I still had to add\n>>> them.\n>>\n>> If you want them to be added automatically, set rerere.autoupdate=true.\n>\n> I would have to caution against doing so without thinking, though.\n> In other words, it is OK if you are Andreas who knows what he is\n> doing, but it is not a very good advice to give to random newbies.\n\nIf you are used to doing \"git add .\" afterwards it can't be much worse.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"249464","messageId":"CAPc5daW5XejS7JFmQagOwgqSxS=subdJyCbM3JL2fa=4RmYsEg@mail.gmail.com","threadId":"37572","inReplyTo":"87iokolfc9.fsf@igel.home","subject":"Re: git merge --abort deletes unstaged files","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-09-15T22:02:24Z","receivedAt":"2014-09-15T22:02:24Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab wrote:\n> Junio C Hamano writes:\n>\n>> Andreas Schwab writes:\n>>\n>>> André Hänsel writes:\n>>>\n>>>> I ran git merge to merge a branch. There were some conflicted files.\n>>>> Although they were automatically resolved by git rerere, I still had to add\n>>>> them.\n>>>\n>>> If you want them to be added automatically, set rerere.autoupdate=true.\n>>\n>> I would have to caution against doing so without thinking, though.\n>> In other words, it is OK if you are Andreas who knows what he is\n>> doing, but it is not a very good advice to give to random newbies.\n>\n> If you are used to doing \"git add .\" afterwards it can't be much worse.\n\nThe right response to such a user would be to teach \"add -u\", or better yet\nto teach to use \"add\" on individual files as they are examined, no?\n"},{"id":"249489","messageId":"87egvcldri.fsf@igel.home","threadId":"37572","inReplyTo":"CAPc5daW5XejS7JFmQagOwgqSxS=subdJyCbM3JL2fa=4RmYsEg@mail.gmail.com","subject":"Re: git merge --abort deletes unstaged files","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2014-09-15T22:28:33Z","receivedAt":"2014-09-15T22:28:33Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Junio C Hamano writes:\n\n> On Mon, Sep 15, 2014 at 2:54 PM, Andreas Schwab wrote:\n>> Junio C Hamano writes:\n>>\n>>> Andreas Schwab writes:\n>>>\n>>>> André Hänsel writes:\n>>>>\n>>>>> I ran git merge to merge a branch. There were some conflicted files.\n>>>>> Although they were automatically resolved by git rerere, I still had to add\n>>>>> them.\n>>>>\n>>>> If you want them to be added automatically, set rerere.autoupdate=true.\n>>>\n>>> I would have to caution against doing so without thinking, though.\n>>> In other words, it is OK if you are Andreas who knows what he is\n>>> doing, but it is not a very good advice to give to random newbies.\n>>\n>> If you are used to doing \"git add .\" afterwards it can't be much worse.\n>\n> The right response to such a user would be to teach \"add -u\",\n\nThat's actually what I meant above.\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}