Commit to a branch with a conflict.