Skip to main content

Branching and merging

00:03 Boozang tool now supports improved branching and merging features.

00:39 Implementing general branch management

01:08 Boozang allows branching and merging for easy workflow management.

01:43 Boozang allows branching and merging for efficient testing

02:19 Branching and merging in Boozang

02:56 Boozang allows branching, merging, and switching branches for continuous integration.

03:23 Merging module B into C with a new commit

03:53 Boozang feature provides a familiar Git-like workflow.

Branching and Merging​

Introduction​

This guide covers the process of using branching and merging in Boozang when working with non-protected branches. This is particularly useful in environments where direct commits to the master branch are allowed or in smaller teams.

Branching in Boozang​

Creating a New Branch​

  1. Select Your Project: Choose the project you want to work on, such as "unit test".
  2. Create a New Branch: Name your branch according to the feature or fix you're working on, e.g., feature-branch or bug-fix-123.

Working on Your Branch​

  • After creating your branch, switch to it to begin your work.
  • Regular commits to this branch are recommended to save progress.

Committing Changes​

  • Commit Regularly: Make sure to commit your changes with clear commit messages.
    • For example, after adding a new test, commit with a message like "Added new test for navigation".

Merging Changes​

Merging Back to Master​

  1. Switch to the Master Branch: If you’re ready to merge your changes, switch back to the master branch.
  2. Merge Your Branch: Select your feature or bug-fix branch and merge it into the master.
  3. Commit the Merge: Finalize the merge by committing it in the master branch.

Handling Merge Conflicts​

  • In cases where there are conflicts between your branch and the master, Boozang provides an interface for conflict resolution.
  • Choose the correct changes from each branch and order them as needed.
  • After resolving conflicts, commit these changes to complete the merge.

Best Practices​

  • Regularly Update Branches: Keep your branches updated with the latest changes from the master to minimize conflicts.
  • Clear Commit Messages: Always use clear and descriptive commit messages for easy tracking of changes.

Conclusion​

Working with non-protected branches in Boozang allows for a more flexible approach to version control, especially in smaller teams or projects with less strict control mechanisms. However, it's important to maintain discipline in commits and merges to ensure the integrity of the master branch.