{"thread":{"id":"29900","subject":"rerere.autoupdate that wouldn't","startedAt":"2012-03-09T22:34:40Z","lastAt":"2012-03-09T22:51:54Z","messageCount":3,"participants":["Phil Hord","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"186593","messageId":"4F5A8580.1010807@cisco.com","threadId":"29900","inReplyTo":null,"subject":"rerere.autoupdate that wouldn't","fromName":"Phil Hord","fromEmail":"hordp@cisco.com","sentAt":"2012-03-09T22:34:40Z","receivedAt":"2012-03-09T22:34:40Z","isPatch":false,"sender":{"key":"phil.hord@gmail.com","avatar":"https://avatars.githubusercontent.com/u/123908?v=4"},"body":"So now I have rerere.autoupdate=true (living on the edge!), and today I\nrebased a branch and git did a new thing: it added the automerged file\nto the index like I expected. \n\nThen git did an unexpected thing.  It told me the merge had failed and\nit asked me to clean it up.  There were no other conflicts; just this\none conflict that was already automerged and added to my index.\n\nAll I had to do was 'git rebase --continue' and off it went.\n\nBut I was hoping for more.  I was hoping that rebase would continue on\nits own and quit bothering me with these triflings. \n\nIs this what is supposed to happen?  Should I look into adding\n'rerere.autoContinue=true'?\n\nMaybe instead, the sane thing would be to add 'rerere.autoTest=make\ntest'.  Then if rerere is so worried about messing up my rebase, he can\ntake a moment to do a build test to comfort his conscience.\n\nPhil\n"},{"id":"186595","messageId":"7vd38l4cl5.fsf@alter.siamese.dyndns.org","threadId":"29900","inReplyTo":"4F5A8580.1010807@cisco.com","subject":"Re: rerere.autoupdate that wouldn't","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-03-09T22:46:30Z","receivedAt":"2012-03-09T22:46:30Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phil Hord <hordp@cisco.com> writes:\n\n> Is this what is supposed to happen?  Should I look into adding\n> 'rerere.autoContinue=true'?\n\n\"Yes\", and \"Perhaps, but there may be a better alternative\".\n\nWhatever rerere did, \"git merge\", \"git am\", and friends should\nreport the fact that the result is not just a trivial conflict-free\nmerge, so that the user can take an appropriate action.  Otherwise\nyou will be robbing the last chance to eyeball the result from\npeople who have been using rerere.autoupdate=true and doing so\nbefore committing.\n\nAnd a better alternative to make \"rerere.autoupdate\" stronger may be\nto make the variable tri-valued, instead of adding a new variable\nthat does not make any sense when rerere.autoupdate is not set.\n"},{"id":"186596","messageId":"4F5A898A.2060701@cisco.com","threadId":"29900","inReplyTo":"7vd38l4cl5.fsf@alter.siamese.dyndns.org","subject":"Re: rerere.autoupdate that wouldn't","fromName":"Phil Hord","fromEmail":"hordp@cisco.com","sentAt":"2012-03-09T22:51:54Z","receivedAt":"2012-03-09T22:51:54Z","isPatch":false,"sender":{"key":"phil.hord@gmail.com","avatar":"https://avatars.githubusercontent.com/u/123908?v=4"},"body":"Writ Junio C Hamano <gitster@pobox.com>,\n> Phil Hord <hordp@cisco.com> writes:\n> \n>> Is this what is supposed to happen?  Should I look into adding\n>> 'rerere.autoContinue=true'?\n> \n> \"Yes\", and \"Perhaps, but there may be a better alternative\".\n> \n> Whatever rerere did, \"git merge\", \"git am\", and friends should\n> report the fact that the result is not just a trivial conflict-free\n> merge, so that the user can take an appropriate action.  Otherwise\n> you will be robbing the last chance to eyeball the result from\n> people who have been using rerere.autoupdate=true and doing so\n> before committing.\n> \n> And a better alternative to make \"rerere.autoupdate\" stronger may be\n> to make the variable tri-valued, instead of adding a new variable\n> that does not make any sense when rerere.autoupdate is not set.\n\nAny preference on the third option-name?\n\nI think  'False || True || Continue'\n\nPhil\n"}]}