-
Notifications
You must be signed in to change notification settings - Fork 12
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
The process of syncing branches #221
Comments
Sure @gfursin. Currently is the purpose of |
My understanding and view on that is following (I am not yet sure what is the best way): We may/will have multiple forks from different external projects that may all eventually try to merge to main. In such case, we can use dev to sync all external projects before syncing them with the stable main branch but without influencing it. I.e. you work and push to mlperf-inference that should eventually go to main while I work on some other projects that may also go to main and we may have interdependencies between them. In such case, if either of us push to dev, we can see that and decide whether we may need to push to dev too to check if our projects are compatible, fix issues and then move aggregated code to the main (and possibly release it). In such cases, we can use "main" (stable) branch in our docs/tutorials for MLPerf and other projects. And if the merge to dev that doesn't require intervention from other projects, it can be quickly propogated to main. I have a feeling that it's a relatively standard "staged" approach for collaborative developments of such projects but we can also adopt some other approach - I am open to introduce best practices for our developments. What do you think? |
Hi @gfursin That's fine but unfortunately as of now Using
I'm fine with it. |
That sounds reasonable. Thanks. |
There should be a defined process how to sync sub-branches in this repo to avoid merge conflicts for people working on different projects.
We have the following hierarchy of branches in this repo:
I think the sync should be in this order:
The text was updated successfully, but these errors were encountered: