Joined October 2012
·
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
Kona
Have at least one original repo where CoffeeScript is the dominant language
Kilo of Lemmings
Establish a space in the open source hall of fame by getting at least 1000 devs to watch a project
Beaver
Have at least one original repo where go is the dominant language
Altruist
Increase developer well-being by sharing at least 20 open source projects
Forked 100
Have a seriously badass project that's been forked at least 100 times
Forked 50
Have a project with a thriving community of users that's been forked at least 50 times
Nephila Komaci
Have at least one original repos where PHP is the dominant language
Nephila Komaci 3
Have at least three original repos where PHP is the dominant language
Walrus
The walrus is no stranger to variety. Use at least 4 different languages throughout all your repos
Lemmings 100
Write something great enough to have at least 100 watchers of the project
Forked 20
Have an established project that's been forked at least 20 times
Forked
Have a project valued enough to be forked by someone else
Charity
Fork and commit to someone's open source project in need
Python
Would you expect anything less? Have at least one original repo where Python is the dominant language
Raven
Have at least one original repo where some form of shell script is the dominant language
@richoh True, and not uncommon. For instance git-flow will always name branches:
feature/this
,feature/that
,hotfix/foo