title: git merge appear conflict,how to solve?
body: <p>My project have a master and a branch named develop. I write some code in a java file named A in develop, than i  switch to the master . when I merge the develop branch, i get the latest code of develop branch  to master. Until now,no errors. But problems appear behind! i switch to branch name develop,when i continue write some code  in the file named A in develop.than I push the file to remote branch named develop. I switch to master, and merge the develop branch. appear conflict in the file named A! why ? and Please tell how to sole it .  if i merge the file conflict continue. There are  still conflicts in the file in next.! Please help me to solve it !</p>