merge conflicts while combining two repos into a single repo.

[rnadupal]

Discussion Type

Question

Discussion Content

Hello,

I am trying to migrate TFS code which is under one single team project to GitHub and merging two separate Git repositories (REPOA and REPOB) into a single repository while preserving history. The repositories have the following structures:

• REPOA: all contents moved under REPOA/syncservices
• REPOB: all contents moved under REPOB/LIVEA

When attempting to merge REPOB into REPOA I am getting merge conflicts. I am using the below commands to merge the repo.

git remote add other-repo ../REPOB
git fetch other-repo
git merge other-repo/master --allow-unrelated-histories

I am suspecting its due to the same history which is being shared between my REPOA and REPOB. Is there any workaround to fix this type of issue or any other approach that I could adopt?

[mecodeatlas]

Thanks for posting in the GitHub Community, @rnadupal!

We're happy you're here. You are more likely to get a useful response if you are posting your question in the applicable category, the Discussions category is solely related to conversations around the GitHub product Discussions. This question should be in the Repositories category. I've gone ahead and moved it for you. Good luck!

[github-actions[bot]]

🕒 Discussion Activity Reminder 🕒

This Discussion has been labeled as dormant by an automated system for having no activity in the last 60 days. Please consider one the following actions:

1️⃣ Close as Out of Date: If the topic is no longer relevant, close the Discussion as out of date at the bottom of the page.

2️⃣ Provide More Information: Share additional details or context — or let the community know if you've found a solution on your own.

3️⃣ Mark a Reply as Answer: If your question has been answered by a reply, mark the most helpful reply as the solution.

Note: This dormant notification will only apply to Discussions with the Question label. To learn more, see our recent announcement.

Thank you for helping bring this Discussion to a resolution! 💬