On 9/22/07, Xilon email@example.com wrote:
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).
meh. Rebasing is normal. It relays your new patches on top of upstream (or whatever you rebase from).
In my case I did more than that..I was fiddling around with my revision history and screwed something up. Which is why it *might* cause problems. But it isn't a big deal by any means.