Feature Branch Workflow

Advantages

• Parallel development: Team members can independently develop new functions or fix problems without affecting the master branch.
• Code isolation: Each branch is independent. That is, the change of a branch does not affect other branches, reducing the risk of code conflicts.
• Fast iteration: By creating and merging branches, teams can quickly iterate new functions or fixes, accelerating software development.
• Easy management: Branches can be created and merged using the Git command line tool or GUI, making versioning more intuitive and convenient.
• Code review: Code review before merging branches helps ensure code quality and knowledge sharing among team members.
• Rollback and cancellation: Code can be quickly restored to the previous state when a problem occurs during development.

Disadvantages

• Complex merge: When multiple function branches need to be merged back to the master branch, complex merge conflicts may occur. In this case, you need to resolve the merge conflicts.
• Resource consumption: Maintaining multiple function branches may consume more computing resources and storage space.
• Branch management: Effective branch management policies are required to prevent too many branches or disordered relationships between branches.

Workflow

1. Create a code repository. In CodeArts Repo, you can create a custom repository, create a repository using a template, and fork an existing repository. You can also import a local repository, import a Git repository, or import an SVN repository.
2. Create a local branch and compile code or create a branch online and compile code.
3. Commit the modified code file to the cache. Currently, Repo supports code commit with Git Bash or Eclipse.
4. Developers create a merge request.
5. Resolve review comments.
6. Committers merge the MR.