error: Merging 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.
error: Merging 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.
Register to vote on and add code examples. Join our developer community to improve your dev skills and code like a boss!
No Good?
Help us improve our code examples by registering to vote on and add answers. Join our developer community to improve your dev skills and code like a boss!