Merge #311: sync-upstream: Extend git usage tips

41cead8 sync-upstream: Extend git usage tips (Tim Ruffing)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 41cead8

Tree-SHA512: ce484d8235a6079be34257bfe859786d2fa666c2f373db7742030210118b8186f8b975517a24be60ee566682d2cdc217f6f10a36ae9c96c9f592dc3c2f5b4331

Author: jonasnick

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 <<EOF
+
+
+This PR can be recreated with \`$REPRODUCE_COMMAND\`.
+
+Tips:
+ * Use \`git show --remerge-diff <pr-branch>\` to show the conflict resolution in the merge commit.
+ * Use \`git read-tree --reset -u <pr-branch>\` 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"