I\'ve pulled all remote branches via git fetch --all. I can see the branch I\'d like to merge via git branch -a as remotes/origin/branchname. Probl
git fetch --all
git branch -a
Whenever I do a merge, I get into the branch I want to merge into (e.g. "git checkout branch-i-am-working-in") and then do the following:
git checkout branch-i-am-working-in
git merge origin/branch-i-want-to-merge-from