[Solved] Git pull not possible because of unmerged files
You have some unmerged files. So, first do commit or stash the files. ... U costing/views.py U tools.py Pull is not possible because you have unmerged files. Please, fix them up in the work tree, and then use 'git add/rm ' as appropriate to mark resolution, or use 'git commit -a'.