I updated sync-upstream by merging master into it, but first cherry-picking changes from master to make the merge commit small. (Indeed: The merge commit is empty, but a merge was still necessary due to conflicts.) I pushed the old branch to sync-upstream-prev.
Review suggestion (assuming your "BlockstreamResearch" remote is called origin)
git fetch
Check that origin/sync-upstream-prev matches what you expect (your old local sync-upstream?) by comparing SHAs
Reset your sync-upstream to origin/sync-upstream (git checkout sync-upstream; git reset --hard origin/sync-upstream)
Check the diff:
git diff sync-upstream-prev..sync-upstream
Optionally git range-diff sync-upstream-prev...sync-upstream (now shows the relevant commits twice, because they appear on both sides due to cherry-picking)
Inspect my merge resolution by git show --remerge-diff sync-upstream
I updated
sync-upstreamby mergingmasterinto it, but first cherry-picking changes frommasterto make the merge commit small. (Indeed: The merge commit is empty, but a merge was still necessary due to conflicts.) I pushed the old branch tosync-upstream-prev.Review suggestion (assuming your "BlockstreamResearch" remote is called
origin)git fetchorigin/sync-upstream-prevmatches what you expect (your old localsync-upstream?) by comparing SHAssync-upstreamtoorigin/sync-upstream(git checkout sync-upstream; git reset --hard origin/sync-upstream)git diff sync-upstream-prev..sync-upstreamgit range-diff sync-upstream-prev...sync-upstream(now shows the relevant commits twice, because they appear on both sides due to cherry-picking)git show --remerge-diff sync-upstream