Why I cann't do fetch and pull?
2014-09-01 05:24:10 GMT
Hi! I'm working in NetBeans IDE 8.0. Our command're working with github. I've done commit, then hit push... After it my friend's done commit and push from him computer. Today I want to get this changing, but I cann't. First, I've hit the fetch button. It's ok. Then I hit the pull button and get error: "You have local modification in working copy that would result in a checkout conflict. You may revert or review and commit the modified files from the Versioning view." All buttons in that form doing nothing, then I hit them. What should I do what I can get changing from github? Thanks. Attachments: http://forums.netbeans.org//files/err1_188.png http://forums.netbeans.org//files/err_100.png