git : Pull is not possible because you have unmerged files

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

Related Posts:

  1. git submodule add error: does not have a commit checked out
  2. Handling file renames in Git
  3. Why are there two ways to unstage a file in Git?
  4. ‘git’ is not recognized as an internal or external command
  5. ‘git’ is not recognized as an internal or external command
  6. How to remove origin from git repository
  7. What’s the purpose of git-mv?
  8. Why git asks to enter a commit message to explain why this merge is necessary
  9. How do I remove version tracking from a project cloned from git?
  10. How do I remove version tracking from a project cloned from git?
  11. git pull on a different branch
  12. Download a specific tag with Git
  13. Git push won’t do anything (everything up-to-date)
  14. How to remove a directory from git repository?
  15. git add . -> still “nothing to commit” with new files
  16. Your configuration specifies to merge with the from the remote, but no such ref was fetched.?
  17. Git error on git pull (unable to update local ref)
  18. git status shows modifications, git checkout — doesn’t remove them
  19. How to resolve git’s “not something we can merge” error
  20. ‘cannot open git-upload-pack’ error in Eclipse when cloning or pushing git repository
  21. How to clone all remote branches in Git
  22. Update Git branches from master
  23. How to squash all git commits into one?
  24. Updates were rejected because the remote contains work that you do not have locally
  25. How to interactively (visually) resolve conflicts in SourceTree / git
  26. How can I delete all of my Git stashes at once?
  27. “fatal: HttpRequestException encountered.” Error with GitHub/Bitbucket Repositories due to dropping TLS-1.0 support
  28. SourceTree keeps asking for Github password
  29. Delete branches in Bitbucket
  30. git add only modified changes and ignore untracked files
  31. Remove node_modules from git in vscode
  32. What’s the use of the staging area in Git?
  33. git push –force-with-lease vs. –force
  34. How can I move a tag on a git branch to a different commit?
  35. What firewall ports need to be open to allow access to external git repositories?
  36. How do I prevent apache from serving the .git directory?
  37. How do I delete a Git branch locally and remotely?
  38. Logitech/LGHUB Lua – Loop with break
  39. What does cherry-picking a commit with Git mean?
  40. Why the range of int is -32768 to 32767?
  41. syntaxerror: “unexpected character after line continuation character in python” math
  42. How can I merge multiple commits onto another branch as a single squashed commit?
  43. How can I determine the URL that a local Git repository was originally cloned from?
  44. Where do I find a list of all mat-icons — Angular
  45. TypeError : ‘method’ object is not subscriptable
  46. In C++, what is wx.h?
  47. How to clamp an integer to some range?
  48. How to create a .gitignore file
  49. How do I rename a repository on GitHub?
  50. What is the iOS 8 System Font?
  51. Simple prime number generator in Python
  52. My new Github page isn’t showing up
  53. You cannot add or change a record because a related record is required in table ‘table_name’
  54. Error in glm() in R
  55. Why does Git say my master branch is “already up to date” even though it is not?
  56. Is there an online application that automatically draws tree structures for phrases/sentences?
  57. Create new tmux session from inside a tmux session
  58. classic ASP error ‘80020009’ Exception occurred
  59. Disable Chrome pinch zoom for use in kiosk
  60. Python High Pass Filter
  61. How to update a branch with master on GitHub
  62. How to disable text selection highlighting
  63. if-not condition fails (jQuery)
  64. RGBA code for red color
  65. java array error “array required but int found”
  66. this: Cannot use this in static context
  67. How can I display the current branch and folder path in terminal?
  68. How to get the filename without the extension in Java?
  69. How to find which git branch I am on when my disk is mounted on other server
  70. ifference between ibatis and mybatis
  71. How to install PyQt4 on Windows using pip?
  72. Should 3rd Parties Use $wp_scripts/$wp_styles->add_data?
  73. Woocommerce plugin – How to create two versions of the same plugin with slightly different implementation for different users
  74. What A Pupil Learns From Writing An Argumentative Essay
  75. Is there an actual way to synchronize ‘production’ and ‘develop’ WordPress databases?
  76. Is it possible to checkout a beta version of WordPress via github?
  77. Redirect, Change URLs or Redirect HTTP to HTTPS in Apache – Everything You Ever Wanted to Know About mod_rewrite Rules but Were Afraid to Ask
  78. List all DNS records in a domain using dig?
  79. Non interactive git clone (ssh fingerprint prompt) [duplicate]
  80. How to add dependency on a Windows Service AFTER the service is installed
  81. Monday morning mistake: sudo rm -rf –no-preserve-root /
  82. What’s the meaning of ‘@’ in a DNS zone file?
  83. Delete Amazon EC2 terminated instance
  84. robocopy transfer file and not folder
  85. What’s the difference between include_tasks and import_tasks?
  86. rm on a directory with millions of files
  87. What ports to open for mail server?
  88. Why is Enterprise Storage so expensive?
  89. Should a wildcard SSL certificate secure both the root domain as well as the sub-domains?
  90. Why can’t MX records point to an IP address?
  91. How to show all banned IP with fail2ban?
  92. How can I get diff to show only added and deleted lines? If diff can’t do it, what tool can?
  93. Adding a user to an additional group using ansible
  94. Best system administrator accident [closed]
  95. Reread partition table without rebooting?
  96. Storing a million images in the filesystem
  97. How to keep rsync from chown’ing transferred files?
  98. How to view connected users to open vpn server?
  99. Can I specify a port in an entry in my /etc/hosts on OS X? [duplicate]
  100. How to check for modified config files on a Debian system?

Leave a Comment

techhipbettruvabetnorabahisbahis forumutaraftarium24eduseduseduedusedueduseduseduedusedus