How do you integrate changes from a remote branch without a merge commit?