Joined March 2013
·
Posted to
merge vs. rebase: choosing the right tool
over 1 year
ago
@leemachin yeah, but whenever your feature branch can be seen by others, it must be clear to them that they should expect the branch to be rewritten at any time. This should be the case if the branch name suggests shortlivedness and volatility.
Posted to
'git pull' is evil!
over 1 year
ago
I've tried to give a balanced comparison of merge and rebase here: https://coderwall.com/p/ny1hia
Achievements
197 Karma
7,801 Total ProTip Views
Nephila Komaci
Have at least one original repos where PHP is the dominant language
Velociraptor
Have at least one original repo where Perl 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
T-Rex
Have at least one original repo where C is the dominant language
On the positive side: as far as I know, the jQuery folks plan to maintain 1.9 for a very long time.