Reputation: 36344
I have made a local branch called develop and have made some changes to it. However I now want to merge another developers changes to remotes/devteam/master into my develop local branch.
How best do I go about doing this?
Upvotes: 0
Views: 66
Reputation: 84343
Assuming you already have a remote defined for devteam:
git fetch --all
git checkout develop
git merge devteam/master
Upvotes: 1