title: How to handle/fix git add/add conflicts?
body: <p>I'm not sure when this error occurs, I haven't found any descriptions in google.</p>
  
  <p>So my colleagues commited some new files and changed files on branch1. I then got these changes and merged them into my branch(branch2) but NOT using git merge but manually using beyond compare (I know it's a bad practice merging manually). However, after merging them manually and copy-pasting the new files in my branch as well, I commited the work in branch2. However, now, when they tried to get some changes from me using git merge origin/branch2 they receive a lot of git "add/add" conflicts on the new files they initially added.</p>
  
  <p>Can anybody tell me why git sees these files as conflicts although they are the same? And how should these conflicts be handled?</p>