In my workflow I have
Your changes are not reflected in
branch1 because they are not part of
In your case,
branch2 comes after
branch1, so you see both. But
branch1 is therefore before
branch2 hasn't happened yet.
What you are seeing is correct. If you are using the
master branch as your "live" or "final" branch, you could merge
branch2 into master:
git checkout master && git merge branch2
This would bring your changes from both branches into
Also: The fact that
branch1 is remote and
branch2 is local doesn't really matter in this case. The commits themselves are in both places (because git is distributed). The "branches" are just names given to different commits to make it easy to manage them.