Resolve conflicts in Merge and Rebase operations

Hi all, I have added an ugly document describing the different behavior between `merge` and `rebase` with an example. I think that it could be useful to understand the differences and it also could help to understand how to resolve conflicts in these operations.