I have two repositories repo-A and repo-B. I want to move repo-A into repo-B as a subfolder. My question is different from the possible duplicate answer! Please don't mark it without any thinking. I did the following in repo-B by following this:
git remote add repo-A url-to-repo-A
git fetch repo-A --tags
git merge --allow-unrelated-histories repo-A/master
However, I got the following error:
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.
How can I solve this?