Reputation: 63720
I'm working on a local branch and want to merge the latest remote master into this to get it up to date with other changes merged to master from a different branch.
I'm new to git, but TortoiseGit is making it more confusing as it doesn't seem to use exactly the right terminology in the exact same way.
Can I even do this, or do I have to update my entire local repo and then merge my local master -> local branch?
Upvotes: 1
Views: 2280
Reputation: 2654
Is this what you're looking for ?checkout remote branch under different name
git checkout -b myBranchName <repo_name>/<remote's_branch_name>
Upvotes: 1