23 Sep
2007
23 Sep
'07
4:46 a.m.
Rebasing on a published repo isn't a good thing to do since it creates conflicts with whoever has already pulled your repo. Instead use merge (It's more verbose in the log, but at least it's smooth).