This short tutorial demonstrates how branch management features in Nuxeo Studio can be used to review configuration made by other developers before it is pushed on a given branch.
Let's consider two users:
- Bob is a new developer that just joined the project.
- Sarah is his manager and wants to review his work before it gets pushed to the master branch.
Bob has some configuration made in a dedicated branch named
feature/assetsmgt that is now ready to be reviewed. Sarah has to select the appropriate save mode, merge the feature branch's content and take a decision.
To review a configuration, you need to use the advanced save mode to benefit from the possibilities described below. The advanced save mode provides a precise control.
- Go to Source Control > Commit Preferences.
- Switch to Advanced save mode.
- Save your changes.
Once the configuration review is finished, you can switch back to another commit mode if you want to.
Your goal is now to review the content in the asset management branch. Let's add it to the content of the master branch and check the results.
- Go to Source Control > Branch Management.
- Checkout the
- Click the Merge into my workspace button for the
assetsmgtbranch and confirm the change.
- In Branch Management, select the
Changes pulled over from the other branch are visible in the Your Work In Progress zone. They are marked in green, because they are only visible from you at this stage until you decide to push them.
For more information about the changes, click on the corresponding commit.
Several decisions are possible at this stage to finish the review:
- Confirm changes and push them in
- Revert changes
- Add some modifications before pushing proposed changes to
To confirm the changes, you need to push the commits directly.
Click on the Push button in the bottom-right corner of the screen, in the status bar. The changes are pushed and your review is complete.
To revert changes, you need to Revert To a previous commit in the commits list.
Click the Revert To button of the first commit in the Merged Commits listing.
Push all commits using the Push button.
A third option is to bring changes before sharing the final result.
- Make the changes you need using Nuxeo Studio, and save your work in progress.
- As you are using the Advanced save mode, you can pile up commits without ending the review by clicking Commit .
- When your changes are complete, push the changes using the Push button at the bottom-right corner of the screen, in the status bar. Changes are pushed and your review is complete.