Joined October 2012
·
kvz

Kevin van Zonneveld

Cofounder at Transloadit
·
Amsterdam, The Netherlands
·
·
·

Posted to Keep your feature branch up to date. over 1 year ago

@richoh True, and not uncommon. For instance git-flow will always name branches: feature/this, feature/that, hotfix/foo

Posted to Keep your feature branch up to date. over 1 year ago

You can just use git checkout - to jump back to the $branch, so that you don't have to figure it out by parsing.
Also, consider using rebase so that your work is replayed onto master. This way should a merge conflict arise, it's easier to determine where your patches go.

Achievements
148 Karma
0 Total ProTip Views