Branching is different in git vs svn/cvs. By itself git branching isn’t too complex.
The git local/remote set-up is new to me. By itself, not too complex.
However, in reality we have to manage the combination of branching and sync – a higher level of complexity addressed in many online discussions. I would prefer to rely on the git commands (rather than GUI tools or Stash) to understand and manage it.
I like the philosophy in http://longair.net/blog/2009/04/16/git-fetch-and-merge/
–comparing the local branch vs remote branch
git diff feature/my_br6 origin/feature/my_br6 — path/to/your/file
–to see the mapping between local ^ remote branches
git branch -vv
–check out a remote branch? local branch to track remote branch?
–delete a branch locally, then remotely: