ProXis

Hi.. have a problem. When I try to merge (with git) i always get this error: You are in the middle of a change. File libbz2.def is modified. You should complete the current commit before starting a marge. Doing so will help you abort a failed merge, should the need arise. I tried resetting branch and created an additional branch. And none of them helped me What can you suggest to me? **EDIT** Never mind. I downloaded mangos from git://github.com/mangos/mangos.git . And now everything is OK.