Ademoverflow - Merge vs rebase strategies with git