Introducing
Your new presentation assistant.
Refine, enhance, and tailor your content, source relevant images, and edit visuals quicker than ever before.
Trending searches
1
Contents...
Feature
Branching
Feature branching is where every feature (or story) gets its own branch and it is only merged into the master when it is completed.
- Need strong team communication so code is not duplicated
- Integration state is uncertain- when is a story REALLY complete?
- Not knowing in which branch a story is being worked on
- Branch merging only works with Git and Mercurial
Limitations
Features
- It isolates developers from the bad changes of others and allows master to be releasable at all times.
- Works with continuous integration and test-driven development
- Works alongside JIRA:
Create a new branch who’s name contains a JIRA issue key
When Bamboo automatically detects the branch, it will find the key and link to JIRA
Any branches that reference the JIRA issue will then be visible from the issue
Features and Limitations
Automated Branching Types
"The Gatekeeper"
Branch Updater
The Branch Updater should be used when you want to:
- Automatically merge changes from the team's master branch into your feature branch, after a successful build of the master branch.
- Get notified when the changes on your feature branch are no longer compatible with the team's master branch.
- Automatically merge your feature branch back into the team's master branch, after a successful build of the merged changes from both branches.
- Get notified when a build of combined changes from both branches fails, preventing the feature branch from being merged back into the team's master branch.