Jeff King <[email protected]> writes:
> The merge of jk/fetch-reachability-error-fix conflicts with
> jt/test-protocol-version, but the conflict resolution done by
> b4ce8375c018 has a typo (looks like an editor mistake):
> ...
Indeed it was. Thanks for spotting.
> The same problem is present in the merges to pu, which is not surprising
> since the 'next' merge was probably just resolved by rerere.
Yup, here is what I did:
$ git checkout b4ce8375c018
$ git am jk-t5516-fix.patch
$ CG=$(git describe)
$ git reset --hard b4ce8375c018^
$ git merge jk/fetch-reachability-error-fix
$ git rerere forget t/t5516-fetch-push.sh
$ git diff $CG ;# shows the typo
$ git checkout $CG t/t5516-fetch-push.sh
# I should learn to use 'git restore' one of these days.
$ git diff ;# shows --cc
$ git rerere
$ git reset --hard
$ git merge jk/fetch-reachability-error-fix
$ git diff $CG ;# shows no difference
That should teach rerere about the right resolution. And to carry
the fix in 'next':
$ git checkout next
$ git am -s3 jk-t5516-fix.patch
Thanks.
