Checking for conflicts instead of uncommitted changes when merging and rebasing