This is Hacker News at it's finest. One post says use rebase, the next post says don't.