Merge issues on every repository

Issue #3868 resolved
Master ACS
created an issue

I am having an issue with all of my repositories. Anytime I accept a pull request, I am getting an error stating, "Please correct the error below - Conflicts during merge". When I pull to my local repository to handle the merge conflict, none exists. Some of the repositories have had only a single person working, and their local copies are updated. This is preventing my team and myself from checking in changes. Any help would be appreciated.

Comments (1)

  1. Log in to comment