Added some more words about rebasing and problems, thanks to @zoranzaric