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

[da-939] Create merge-main-into-small-image.yml #22

Merged
merged 2 commits into from
Nov 13, 2023

Conversation

marisimon
Copy link
Contributor

Configure GithubActions workflow that merges main into small-image whenever a pull request is merged into main.

Configure GithubActions workflow that merges main into small-image whenever a pull request is merged into main.
@marisimon marisimon changed the title Create merge-main-into-small-image.yml [da-939] Create merge-main-into-small-image.yml Nov 2, 2023
run: |
git fetch
git checkout small-image
git merge main --no-ff --no-edit
Copy link
Contributor Author

@marisimon marisimon Nov 7, 2023

Choose a reason for hiding this comment

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

tested it on a private personal repo. It should work unless there are merge conflicts. Need to merge it to test it here ➿

Copy link
Collaborator

@cmrigney cmrigney left a comment

Choose a reason for hiding this comment

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

Looks good, let's try it out!

@cmrigney cmrigney merged commit 6f3d86f into main Nov 13, 2023
@cmrigney cmrigney deleted the marisimon-add-merge-main-into-small-image.yml branch November 13, 2023 14:51
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