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

Jump to bottom

Merge before update to step 5 #57

Merged
merged 3 commits into from
Jan 8, 2024
Merged

Merge before update to step 5 #57

merged 3 commits into from
Jan 8, 2024

Conversation

sinsukehlab
Copy link
Contributor

Summary

ToDo of PR #53
The better way to deal with the merge conflicts was figured out.

Changes

  • Create ./.github/script/merge-branch.sh, a script to merge branches
  • Add a step to run the script to merge changes from origin/main into ci in order to avoid merge conflicts

Closes: #56

Task list

  • For workflow changes, I have verified the Actions workflows function as expected.
  • For content changes, I have reviewed the style guide.

@rsese rsese requested a review from a team January 5, 2024 21:07
heiskr
heiskr approved these changes Jan 8, 2024
View reviewed changes
Copy link
Contributor

@heiskr heiskr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great to me, thank you :)

@heiskr heiskr merged commit 420fa7a into skills:main Jan 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@heiskr heiskr heiskr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Feature] TODO: figure out a better way to deal with the merge conflicts
2 participants
@sinsukehlab @heiskr