/
Merging-Strategy

Merging-Strategy

These are our steps of how to merge a branch in Onshape:

  1. We merge from Main to the working-branch

  2. We fix the working-branch

  3. We merge the working-branch back to Main

  4. We create a version called “Merged PR-XX: Some short name” of Main

  5. We rename the working-branch to "Delete PR-XX: Some short Name"

Deleting (cleaning) is done in a team event (pib.Lab!)