Merging branches afer migration about tomono HOT 6 OPEN

Yes, have a look at git subtree and specially -X option ;-)
https://medium.com/@porteneuve/mastering-git-subtrees-943d29a798ec

I have used tomono to create the monorepo for all develop branches and then use subtree merge to recreate old feature, release, hotfix, ... branchs on the new monorepo :
git checkout develop
git checkout -b
git merge -X subtree= /

And it worked !

If you used tomono to create more than one branch, you won't be able to merge them in the future

from tomono.

I've encountered the same problem. Still investigating the issue.

from tomono.

Hi,

I've encountered the same problem.
Did you find a workaround ?

Thanks,
Florent

from tomono.

I have the same issue. Did any of you have some luck with a workaround?

from tomono.

We're running into the same issue with no clear fix. For instance, we have our master and develop branches, however, we can't seem to merge master into develop due to the CONFLICT (rename/delete) issue.

from tomono.

I had a look at this but I can't easily reproduce it. Do you have an example?

Here is a sample test script that seems to work OK:

• https://github.com/hraban/tomono/blob/issue-21/test.sh
• output: https://github.com/hraban/tomono/actions/runs/8313669923/job/22749917987

from tomono.