Om3ga
Om3ga

Reputation: 32823

How to merge two branches on remote repos

I have a remote repo. It has four branches i.e. master, branch1, branch2, branch3. I pushed changes to master repo. Now I want to add those changes to branch3. Do I have to merge them If yes then how can I do that?

Upvotes: 0

Views: 70

Answers (2)

victrnava
victrnava

Reputation: 1164

Yes, first make sure you are in sync with your remotes:

checkout master
pull origin master
checkout branch3
pull origin branch3

then do the merge

merge master

then push if you need to

push origin branch3

Upvotes: 1

Thunder Rabbit
Thunder Rabbit

Reputation: 5449

I think it's just

git checkout branch3
git rebase master

Upvotes: 2

Related Questions