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.

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

🍒 Merge changes from PR #245 to release-v1.6.0 #246

Merged
merged 7 commits into from
Sep 19, 2024

Conversation

github-actions[bot]
Copy link

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

[auto-pr-release-v1.6.0-245-6744 cee31947] explicitly specify from which branch the release tag should be created from
Author: Riku Rouvila <[email protected]>
Date: Wed Aug 21 15:11:09 2024 +0300
1 file changed, 2 insertions(+)
[auto-pr-release-v1.6.0-245-6744 90e1a5f9] use release version instead of package.json version
Author: Riku Rouvila <[email protected]>
Date: Wed Aug 21 15:26:22 2024 +0300
1 file changed, 2 insertions(+), 6 deletions(-)
[auto-pr-release-v1.6.0-245-6744 c674381f] add descriptive merge messages
Author: Riku Rouvila <[email protected]>
Date: Wed Aug 21 16:26:15 2024 +0300
1 file changed, 2 insertions(+)
[auto-pr-release-v1.6.0-245-6744 70bd3f0c] remove the v-prefix from versions
Author: Riku Rouvila <[email protected]>
Date: Wed Aug 21 16:26:54 2024 +0300
1 file changed, 2 insertions(+), 2 deletions(-)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply ce251be5... update CHANGELOG

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-245-6744:auto-pr-release-v1.6.0-245-6744
git fetch origin fix-publish-pipeline:fix-publish-pipeline

git checkout auto-pr-release-v1.6.0-245-6744
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick a6305982 77e04a3f 73b05331 7f798246 ce251be5

@rikukissa rikukissa force-pushed the auto-pr-release-v1.6.0-245-6744 branch from 4dd4db8 to 68d6c4d Compare August 21, 2024 14:29
@Zangetsu101 Zangetsu101 merged commit 5021822 into release-v1.6.0 Sep 19, 2024
1 check passed
@Zangetsu101 Zangetsu101 deleted the auto-pr-release-v1.6.0-245-6744 branch September 19, 2024 05:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants