Joined June 2012
·
Posted to
Git always rebase on git pull
over 1 year
ago
Thanks for advice @sheerun, but I think that provided scenarion:
You check out master branch
You do your feature on feature branch while origin/master also changes on remote side
You merge your feature branch to your local master, without calling git-up before
You run git-up what results in rebasing master on origin/master and you loose your merge history: is just really bad habbit. You need to rebase your feature branch on top of origin/master first, and after that merge it in to the local master branch. It's just obvious for me.
Achievements
620 Karma
30,745 Total ProTip Views
Python
Would you expect anything less? Have at least one original repo where Python is the dominant language
Narwhal 3
Have at least three original repos where Clojure is the dominant language
Walrus
The walrus is no stranger to variety. Use at least 4 different languages throughout all your repos
Forked
Have a project valued enough to be forked by someone else
Charity
Fork and commit to someone's open source project in need
Mongoose 3
Have at least three original repos where Ruby is the dominant language
Mongoose
Have at least one original repo where Ruby is the dominant language
Raven
Have at least one original repo where some form of shell script is the dominant language
Kona
Have at least one original repo where CoffeeScript is the dominant language
Narwhal
Have at least one original repo where Clojure is the dominant language
user related stuff in etc is very ugly way of doing this.