search

DDMAL / VIM

The Virtual Instrument Museum website repository
MIT License
0 stars 2 forks source link

Create important branches and update branch protection rules #6

Open zhannaklimanova opened 1 year ago

zhannaklimanova commented 1 year ago
dchiller commented 1 year ago

Any additional thoughts on this? I protected main from direct pushes last week, but looking like that didn't work exactly, so gonna try to figure out why.

zhannaklimanova commented 1 month ago

Any additional thoughts on this? I protected main from direct pushes last week, but looking like that didn't work exactly, so gonna try to figure out why.

Yup, so we're going to need to look into this more because I initially thought there would be an automatic PR when pushing to develop and when I recently pushed my README changes, they were merged right away. I thought that there were stricter branch protection rules and that a PR would be created for me automatically to merge develop into develop but that didn't happen. It's just the markdown that I modified so nothing catastrophic got merged but this is still something we will need to modify. I will do some testing on this over the week and see what I can come up with as a solution.

dchiller commented 1 month ago

Yup, so we're going to need to look into this more because I initially thought there would be an automatic PR when pushing to develop and when I recently pushed my README changes, they were merged right away

I just disabled force pushes for the develop branch. For a PR though, you shouldn't push to the develop branch, because a PR is between different branches.

zhannaklimanova commented 1 month ago

There’s no way at all to configure develop branch such that a direct push to it triggers an automatic PR? I looked through the configurations myself yesterday and there doesn’t seem to be anything like that but maybe it’s a feature I’m not able to see with my current permissions.

dchiller commented 1 month ago

What branch would the PR be from if you are pushing to the same branch as the branch the PR is to?

zhannaklimanova commented 1 month ago

What branch would the PR be from if you are pushing to the same branch as the branch the PR is to?

I believe I’ve seen somewhere a PR that had develop->develop. The idea is that after we have pulled and rebased our changes locally, when pushing to the remote version of develop, there is just a PR issued as a final check before allowing those changes to be integrated into the global repository code. I don’t know if this is at all possible however.

dchiller commented 1 month ago

I believe I’ve seen somewhere a PR that had develop->develop

I suspect those are from different forks. if you have your own fork and you push to the develop branch on that fork, you can then PR into the develop branch on DDMAL.

zhannaklimanova commented 1 month ago

Oh, yes that might be the case. Thanks for clarifying.

I believe I’ve seen somewhere a PR that had develop->develop

I suspect those are from different forks. if you have your own fork and you push to the develop branch on that fork, you can then PR into the develop branch on DDMAL.