Use rebase during push to simplify merge conflict resolution