If you are contributing to a shared repository, you may encounter merge conflicts when you attempt to merge your changes to the master branch. Put the following steps in order to successfully resolve a merge conflict. Edit - Edit the files marked with merge conflicts, and remove the markers. Pull - Retrieve the latest version of the code from the remote repository. Commit and Push Push the changes to the remote repository. Add to Index- Add the edited files to be indexed