Comments (6)
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.
Related Issues (20)
- issue with annotated tags HOT 1
- License missing HOT 5
- packed-refs are ignored when listing remote branches HOT 3
- Ownership Transfer HOT 5
- Does it properly handle branches in multiple repos? HOT 2
- Empty history for folders HOT 1
- How to sync the new branches of the subrepos after migration? HOT 1
- Is there any way to migrate PR of sub repo to monorepos HOT 1
- error: unknown option `atomic' HOT 1
- error: invalid path on Windows (carriage-return issue) HOT 1
- case-sensitive branch-names break on Windows HOT 3
- matching branch-path-folders and branch-names will break merge HOT 2
- Namepaced tags pushing to remote failure HOT 5
- Commit history of a repository is missing after the merge of four repositories HOT 7
- Only the remote's local branches are cloned, not the remote's remote tracking branches HOT 3
- Combine into monorepo - same git name HOT 3
- After using tomono, rebase and log contents are very different. HOT 6
- How to handle ambiguous refname HOT 3
- LFS Support? HOT 3
- What To Do With Merged Branches HOT 17
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from tomono.