Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Merging a pull request into multiple branches

Tags:

git

github

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?

like image 597
Salil Surendran Avatar asked Jan 29 '14 19:01

Salil Surendran


People also ask

How do I combine pull requests?

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.


2 Answers

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

like image 121
Kiarash Zamanifar Avatar answered Oct 10 '22 03:10

Kiarash Zamanifar


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?

like image 5
bitoiu Avatar answered Oct 10 '22 05:10

bitoiu