git: rebase conflicts
git: branching: update remote branch list