diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh index 26a842c01..c1ad8e0a8 100755 --- a/contrib/sync-upstream.sh +++ b/contrib/sync-upstream.sh @@ -116,7 +116,17 @@ do done # Remove trailing "," TITLE=${TITLE%?} -BODY=$(printf "%s\n\n%s\n%s" "$BODY" "This PR can be recreated with \`$REPRODUCE_COMMAND\`." "Tip: Use \`git show --remerge-diff\` to show the changes manually added to the merge commit.") +BODY+=$(cat <\` to show the conflict resolution in the merge commit. + * Use \`git read-tree --reset -u \` to replay these resolutions during the conflict resolution stage when recreating the PR branch locally. + Be aware that this may discard your index as well as the uncommitted changes and untracked files in your worktree. +EOF +) echo "-----------------------------------" echo "$TITLE"