Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated cherry-pick of 5b34f4c5968afd2b69353fcbb364a8697d7a131e #76

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Automated cherry-pick of 5b34f4c5968afd2b69353fcbb364a8697d7a131e #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6899020
Feature/great stuff 1736960665 (#75)
robertaandersen Jan 15, 2025
1d29a57
Automated cherry-pick of 5b34f4c5968afd2b69353fcbb364a8697d7a131e
robertaandersen Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/pr-torelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
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 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 }}"
Expand Down
3 changes: 2 additions & 1 deletion stuff.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ HalloGreatStuff-1736951817
I am working on a unicorn thing


I've gone ahead and created a great hotfix
HalloGreatStuff-1736960665

Loading