You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
We recently ran into a lovely "feature" of github where this action created a pr from
master
todevelop
. 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 mergeddevelop
intomaster
in order to recreate the pr. Themaster
branch had branch protections on that require a pr, but github ignored the protections and mergeddevelop
straight intomaster
without a pr.In order to mitigate this problem the action should create a brach from
master
and merge that intodevelop
. We'll want to use a consistent naming scheme (e.g.merge-master-develop
instead ofmerge-master-develop-YYYY-MM-DD
) in order to detect if the branch has already been created.The text was updated successfully, but these errors were encountered: