NetBeans + Git + Bitbucket. Merge error. How to be?

Question

PHP

The situation is this: a friend made a commit, I want to pull it from Bitbucket and resolve conflicts with a merge.
Here is the course of my actions:
1.
2.
3.
Output:

==[IDE]== 02/10/2015 03:50:08 PM Fetch - interb
git fetch https://[email protected]/Diver/interb.git +refs/heads/*:refs/remotes/origin/*
Updates missing
git merge origin/master
Merge result: Failed
Merge HEAD to origin/master failed due to the following files:
C:\Users\dima\Documents\NetBeansProjects\interb\.htaccess
==[IDE]== 10.02.2015 15 :50:41 Retrieval - interb Completed.

I am working with Git for the first time and I absolutely cannot understand what is wrong with the .htaccess file
. Help me figure it out, please.

Answer 1

Either he is in a conflict state (you both changed him).
Or you have uncommitted changes in it that Git doesn't want to lose.
And for normal information, git pull can be done through the console, then at least it will be clear that he does not like it.

Answer 2

.htaccess can't be, say, write-protected?

Answer 3

Try the same operations, just in case, with your hands from the console git.
At one time, a home-made netbean craft for native git surprised with its unexpected surprises.
Naturally, at the same time, everything worked under native in the console.