From 41cead8a0bb2fdccc93a04973ef6859dad93c150 Mon Sep 17 00:00:00 2001
From: Tim Ruffing <me@real-or-random.org>
Date: Thu, 5 Feb 2026 15:50:58 +0100
Subject: [PATCH] sync-upstream: Extend git usage tips

---
 contrib/sync-upstream.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh
index 26a842c0..c1ad8e0a 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 <<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"