解决与Netbeans中的git冲突的问题

Question

我在netbeans中使用bitbucket，使用pull函数时遇到问题。 在我的本地更改中，我在代码中间添加了一些行，我已经提交了它，但是当我从远程分支中提取现有文件时，我尝试解析conflits，所有代码在文件之间被认为是不同的只有我添加的行。 可能有什么不对？

这是'git status'然后'git pull'的结果：

$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 2 and 1 different commit each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working directory clean

mergulhao@MERGULHAO-PC /C/Users/mergulhao/snimar/snimar/autoMetadata/src (master
)
$ git pull
Password for 'https://iFalcao@bitbucket.org':
remote: Counting objects: 15, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 10 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (10/10), done.
From https://bitbucket.org/snimar/snimar
   2abf060..6c4be77  master     -> origin/master
Auto-merging autoMetadata/src/MD_Classes.py
CONFLICT (content): Merge conflict in autoMetadata/src/MD_Classes.py
Automatic merge failed; fix conflicts and then commit the result.

请注意，在下图中，当我尝试解决冲突时，所有代码都标记为红色而不是仅仅是我的新行

del contact_temp