RabbitVCS , Unable to Resolve Conflict

view full story

http://ubuntuforums.org – I am unable to resolve conflict i am able to commit and update , most of the basic feature works but now i have a conflict and i am unable to resolve it so i kinda cant commit anymore i am using 12.10 ubuntu (Hardware)