Rebase/Resolve conflicts documentation

I can't find much in the way of documentation about how to rebase and resolve conflicts. Do we have anything like this @axil ?