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

Branch master instead of using it as base #44

Open
straker opened this issue Jan 15, 2024 · 0 comments
Open

Branch master instead of using it as base #44

straker opened this issue Jan 15, 2024 · 0 comments

Comments

@straker
Copy link

straker commented Jan 15, 2024

We recently ran into a lovely "feature" of github where this action created a pr from master to develop. The pr got out of date and there was a conflict of package-lock.json (due to dependabot prs going into develop first) and so I clicked the "update branch" button to have github recreate the pr for us, and what happened is github automatically merged develop into master in order to recreate the pr. The master branch had branch protections on that require a pr, but github ignored the protections and merged develop straight into master without a pr.

In order to mitigate this problem the action should create a brach from master and merge that into develop. We'll want to use a consistent naming scheme (e.g. merge-master-develop instead of merge-master-develop-YYYY-MM-DD) in order to detect if the branch has already been created.

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

No branches or pull requests

1 participant