I am using php-git client to pull branches in my php script. and whenever i do checkout from master to testing i get following error.
error: Pull is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.
my files are on bitbucket server. and i add/modify files on bitbucket and commit there.
I dont understand , I dont mofify anything on my local machine, still i get this error.
Following is my ‘git status’ output.
Your branch is up-to-date with 'origin/testing'. You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Changes to be committed: modified: g_1.0.yaml new file: potter_3.4.yaml new file: potter_3.4.yml Unmerged paths: (use "git add <file>..." to mark resolution) both modified: abc_1.0.json