20
The merging is done to your working copy. Therefore, you should update first, in order to avoid conflicts. No harm is done, however, if you try to commit. If there are remote conflicting modifications, the commit will remain undone anyway.