Merge branch 'main' into hotfiximportant

island-is · Jan 15, 2025 · 74974a1 · 74974a1
2 parents 17e3bf5 + 6edc711
commit 74974a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/pr-torelease.yml b/.github/workflows/pr-torelease.yml
@@ -69,7 +69,7 @@ jobs:
           git config --global user.name "${{ github.actor }} (automated)"
           git checkout release/${{ steps.latest_release.outputs.LATEST_RELEASE }}
           # git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }} --strategy-option theirs
-          git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }} --strategy-option theirs
+          git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }}
           git checkout -b unicorn/${{ github.event.pull_request.merge_commit_sha }}
           git commit --allow-empty -am "Automated cherry-pick of ${{ github.event.pull_request.merge_commit_sha }}"
           git push --set-upstream origin unicorn/${{ github.event.pull_request.merge_commit_sha }}

diff --git a/stuff.txt b/stuff.txt
@@ -15,4 +15,8 @@ I am working on a unicorn thing
 
 HalloGreatStuff-1736960665
 
-Doing very important hotfix
+
+Doing very important hotfix
+
+HalloGreatStuff-1736961437 - doing some important work
+