Writ Junio C Hamano <gitster@xxxxxxxxx>, > Phil Hord <hordp@xxxxxxxxx> writes: > >> Is this what is supposed to happen? Should I look into adding >> 'rerere.autoContinue=true'? > > "Yes", and "Perhaps, but there may be a better alternative". > > Whatever rerere did, "git merge", "git am", and friends should > report the fact that the result is not just a trivial conflict-free > merge, so that the user can take an appropriate action. Otherwise > you will be robbing the last chance to eyeball the result from > people who have been using rerere.autoupdate=true and doing so > before committing. > > And a better alternative to make "rerere.autoupdate" stronger may be > to make the variable tri-valued, instead of adding a new variable > that does not make any sense when rerere.autoupdate is not set. Any preference on the third option-name? I think 'False || True || Continue' Phil -- 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