Merge Conflict

If you receive Auto-Merge CONFLICT (add/add): Merge conflict in erors when executing git pull commands, then local changes have been made that cause the git pull to fail.

If this happens, you must delete the repository from your local machine and re-do the git clone procedure to rebuild the local copy of the repository.