Manisha Agarwal

That never gets old. ;~)

should have done a rebase :P

git push master && forget about it

git merge and then git rebase -i

eheh, I haven't had to do this ... yet.

@markusvoelter what do CVS and SVN merge look like, Thun

That gif also doubles as a deployment strategy.

@raveeshbhalla gay sex is explosive apparently

or cherry-picking a bugfix from upstream into your working branch and later rebase onto upstream

23333