Getting error - Cannot pull into a repository with state: MERGING_RESOLVED when changes are made in excel sheet.

softwaremill / codebrag

Your daily code review tool

http://www.codebrag.com

GNU Affero General Public License v3.0

649 stars 96 forks source link

Getting error - Cannot pull into a repository with state: MERGING_RESOLVED when changes are made in excel sheet. #114

Open Kiran-Rath opened 4 years ago

Kiran-Rath commented 4 years ago

I am not able to pull latest project from GIT as it is throwing below error: Cannot pull into a repository with state: MERGING_RESOLVED

I have made changes in excel sheet for both user. I have pushed user 1 code to GITHUB and now when i am pulling project for user 2 for latest code i am getting this error.

Does anyone have idea about it?