Rebase Version Tree

fabian_mühlberger066

Hi,

I use a lot of "master sketches" and "master variables" that I derive in bigger assemblies. Since every change in a derived variable table needs a new version I am forced to created a lot of versions.

Can I rebase my master assembly or insert the variable studios from the master brach instead of an version?

Best Fabian

eric_pesty

If you move your variable studio the same document as you assembly you won't need to create versions.

fabian_mühlberger066

I might do that, but since parts of the assembly get reused in other assemblies too, my first thought was to keep some separation. If there isn't away around this, I might just live with it.

Regarding rebase? Is there a way to do this?

eric_pesty

I have no idea what you mean by "rebase"...

fabian_mühlberger066

rebasing is similar to a merge in software development but does thing a bit different. Hard to explain but here is a overview.
https://www.atlassian.com/git/tutorials/merging-vs-rebasing
https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase
Basically:
"Rebasing is the process of moving or combining a sequence of commits to a new base commit."

What I was looking for was to rebase the whole main branch to one commit to eliminate the whole version tree.

lana

If it is a not a Main workspace - you can achieve this by merging (https://cad.onshape.com/help/Content/merge.htm?Highlight=merge workspace) to Main and deleting the other workspace. Merge would be the concentrated commit of everything on that branch. If it is Main, you can start a new branch from Start, merge Main into it, but I don't think Onshape'll let you to delete Main.

fabian_mühlberger066

Ty for the hint, I'll check it out. I used the term 'delete' but you are correct, in a version tree delete isn't really an appropreate term.

Nevertheless, The strategy for cleaning up the onshape version tree and history  pretty envolved compared to what I am used to in software dev. Even tough there isnt really a local or remote version of the file itself.
Maybe this is whats a bit confusing to me, since terminology stems from Git, but the features work differently.