Added notes on merge vs rebase.