From 6121a7feadd4ecf3942a209f260b5e59e83ff057 Mon Sep 17 00:00:00 2001
From: Steven B <51370195+sdb9696@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:12:42 +0000
Subject: [PATCH] Tweak RELEASING.md instructions for patch releases

---
 RELEASING.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/RELEASING.md b/RELEASING.md
index 032aeb0c5..e3527ceaf 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -283,9 +283,12 @@ git rebase upstream/master
 git checkout -b janitor/merge_patch
 git fetch upstream patch
 git merge upstream/patch --no-commit
+# If there are any merge conflicts run the following command which will simply make master win
+# Do not run it if there are no conflicts as it will end up checking out upstream/master
 git diff --name-only --diff-filter=U | xargs git checkout upstream/master
+# Check the diff is as expected
 git diff --staged
-# The only diff should be the version in pyproject.toml and CHANGELOG.md
+# The only diff should be the version in pyproject.toml and uv.lock, and CHANGELOG.md
 # unless a change made on patch that was not part of a cherry-pick commit
 # If there are any other unexpected diffs `git checkout upstream/master [thefilename]`
 git commit -m "Merge patch into local master" -S