Re: odd behavior with git-rebase

Neal Kreitzinger [off-list ref] writes:

On 3/26/2012 5:53 PM, Phil Hord wrote:
...

quoted

 2. There is a rerere autoresolved conflict git wants me to approve
 examine / test / --continue

You trust rerere?  I take back my earlier comment,...

He does "rerere" and then "examine"s, doesn't he?  So it is not "blindly
trust", but "trust and verify".

quoted

 I really wanted something like this:

 $ git rebase --purge-empty --accept-rerere-authority -i master

--accept-rerere-authority sounds like another recent thread (maybe
from you).

It was from a different person and on a different command, but I think
they are going in the same direction.  The "--rerere-autoupdate" option of
"git am", "git rebase" and "git merge" could learn to be a bool-plus, a
stronger form than "yes/no", such that it makes a commit if everything
auto-resolves cleanly (and rerere.autoupdate configuration could learn to
be a bool-plus as well).

While I am hesitant to endorse such a mode of operation, as it can invite
sloppy users hurt themselves, I do not fundamentally oppose it as an
option.  It could save time for diligent users who know when to examine
and verify the result, in order to avoid casting the result with blind
faith in mechanical merges.