CODEWITHSUNDEEP
gitgithubgit-mergegit-pull
Java Spring Coder
Java Spring Coder

Reputation: 1027

how to merge a pull request in two branches?

I have two branches develop and test. test is behind develop which was created few weeks back.

I have created a pull request for test and my team member merged it. Now I want to push the same change to develop branch. I tried cherry-pick but it didn't work.

Is there anyway, I can pull the same pull request to develop branch?

Upvotes: 13

Views: 18209

Answers (2)

schumacher574
schumacher574

Reputation: 1129

A pull is nothing more than a fetch followed by a merge.

Hard to say without having more info on your commit tree, but you should be able to git checkout the develop branch, git merge with test (or whatever commit you're trying to merge with), and then git push your local develop branch to the remote repo's develop branch.

Upvotes: 4

gturri
gturri

Reputation: 14639

As far as I understand, your team member merged test in master when he accepted the pull request.

To now merge it in develop you could simply do, in your local repo

git checkout develop
git merge test
git push origin develop

Upvotes: 3

Related Questions