title: Multiple conflicts after merging multiple repositories into one
body: <p>I merged multiple repositories into one single repository by following this tutorial: <a href="https://leewc.com/articles/how-to-merge-multiple-git-repositories-into-one-repo/" rel="nofollow noreferrer">https://leewc.com/articles/how-to-merge-multiple-git-repositories-into-one-repo/</a>. But it seems it wasn't a good way because right now when I try to merge a feature into my branch test, I have 100 conflicts.</p>
  
  <p>I created this feature in the new repository after the merging of all repositories into my new repository. The ancient repositories were <code>formation-front</code>, <code>formation-back</code> and <code>formation-services</code>, and I have now a single repository <code>formation</code> that contains the folders <code>formation-front</code>, <code>formation-back</code> and <code>formation-services</code>. The ancient repositories didn’t share file names or paths.</p>
  
  <p>For example I had one repository <code>formation-front</code>, with 3 branches: <code>dev</code>, <code>test</code> and <code>master</code>. So I created a branch <code>project_A_dev</code> in the new repository, and I merged the branch <code>dev</code> of <code>formation-front</code> inside this branch. I did that for the 3 branches <code>dev</code>, <code>test</code> and <code>master</code> of my 3 repositories.</p>
  
  <p>How does Git identify the files? Do the files have an id? Are the errors and the conflicts because of the fact that certain files have ancient id due to the old repo I was merging from, and certain files have new id? I didn't have all these conflicts before merging repositories.</p>