[Qgis-community-team] git issues

[matteo]

Hi guys,
I have a problem with git... (again)..
I correct some files and I want to commit them, but when I try I receive 
this error:

error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.

What happens? What should I do?

Cheers

Matteo


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/qgis-community-team/attachments/20130315/276b23b5/attachment.html>