3. Session Objectives
We will share recommendations and best practices for
using Spira and TaraVault to manage your source
code, with examples using both Git and Subversion.
We will discuss the recommended workflow for
development tasks, linking tasks to code commits,
and using our IDE plugins to improve efficiency.
16. Subversion Workflow
o Primary Development is done
in Trunk
o Commit into Trunk
o Branches used for older
versions being maintained
o Commit into Branches
o Tags used for milestones and
mark releases
o Cannot commit into tags
18. Git Workflows
Several possible models:
Git Flow (recommended)
GitHub Flow
GitLab Flow
One Flow
Trunk-based development (like SVN)
19. Git Flow Workflow
• master — this branch contains production code. All
development code is merged into master in sometime.
• develop — this branch contains pre-production code. When
the features are finished then they are merged into
develop.
• feature/* — feature branches are used to develop new
features for the upcoming releases. May branch off from
develop and must merge into develop.
• hotfix/* — hotfix branches are necessary to act
immediately upon an undesired status of master. May
branch off from master and must merge into master and
develop.
36. Key Takeaways
1. Spira has many plugins and integrations to make
developers’ lives easier
2. Define a code and task management workflow that
works for you and your team
3. Make sure that testing is fully integrated into your
workflow from day one