Merge conflicts occur when changes are made to the same line of a file, or when one person edits a file and another person deletes the same file. They can also happen when you push multiple commits. You can resolve merge conflicts in your workspace through a guided application for both the main code repository and any additional imported repositories. If you were making multiple commits, the latest commit might overwrite changes that you made during conflict resolution.