2 ms·
Like I said, I cannot merge because we cannot push from our computer to Github(It's locked). The only way to get code into branch is by doing a PR, and click m
by kureikain 7y ago
Like I said, I cannot merge because we cannot push from our computer to Github(It's locked).
The only way to get code into branch is by doing a PR, and click merge button on Github UI. But a PR cannot be merged twice.
And If I open two PRs two master/develop then I will see this kind of error on Github: "This branch is 1 commit behind. 1 commit ahead of develop"
- cfstras 7y agothe way to go here is probably creating an "administrator" account which is used by those merging scripts, and allow push access to protected branches for administrators.
- dillonmckay 7y agoSo, on my team, juniors can create feature branches and easily deploy a feature branch to a ‘staging’ server. If the feature is deemed good, an ‘admin’ will ‘finish’ the feature and it is merged into develop branch. Then, when we are ready for a release, the ‘admin’ will create a release and both develop and master are updated. Updating master triggers a webhook that deploys the release. For a hotfix, the release step is skipped, but both develop and master are updated, again causing the webhook to trigger a deployment.