Although you are prompted to check in the file after the merge, consider verifying the merge results (for example, by opening the file and viewing its contents) before checking in the file.
If you do not merge the latest version with your changes, you cannot check in your version of the file on the branch currently specified by your config spec.