We have pull requests coming from other forks as well as branches within our own fork that has to go to multiple branches. Is there a way we can merge pull requests to multiple branches in one step?
Adding a pull request to a merge queue On GitHub.com, navigate to the main page of the repository. Under your repository name, click Pull requests. In the "Pull Requests" list, click the pull request you would like to add to a merge queue. Click Merge when ready to add the pull request to the merge queue.
This should have been implemented into GitHub to make sure commits into release branches are also merged into master.
Plugins (3rd party apps) could help but not for free (unless your project is open-source). https://github.com/marketplace/mergify
No, you can't unfortunately: http://git-scm.com/docs/git-merge
When I have that requirement (which is not that often), I usually do it manually in the console. If that is a big burden on your workflow I would suggest a shell-script that could first do all the merges without conflicts and then let you manually fix the others.
Is this a requirement because you have too many concurrent development lines at the same time?
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With