VC (VERSION CONTROL)

The Trilinos github repository contains several long-lived branches:

• develop: The main development branch that Trilinos developers issue pull request to in order to add new features, fix bugs, etc.
  • Who pulls from this branch?
    • Close collaborators and customers that want to help test (not use) new features as they are being developed
    • Very close collaborators that want to have access to the very latest development version of Trilinos who don't mind dealing with more defects and increased instability
• master: A relatively stable version of Trilinos that is updated from the 'develop' branch when a specific set of builds for a specific set of packages have 100% passing tests
  • Who pulls from this branch?
    • Close collaborators and users who want to access a very recent yet fairly stable version of Trilinos
• trilinos-release-X-Y-branch: Branch for the maintenance of the set of Trilinos X.Y.Z releases. Official releases of Trilinos are tagged on this branch using the tag name trilinos-release-X-Y-Z
  • Who pulls from this branch?
    • External users that need named and supported versions of Trilinos with minimal-change patch releases for bug fixes (Note, users only should access tagged releases trilinos-release-X-Y-Z and not just pull from the tip of a release branch).

The following links provide information on Trilinos version control processes and workflows.

• See How to Do Version Control with Git in Your CSE Project (an IDEAS Productivity "How To" Document).
• Do an initial setup to use git on any new machine.
• Use the simple centralized workflow to integrate and push changes to a shared remote tracking branch (i.e. the 'develop' branch).
• For typical development, most developers will checkout, make changes, and push changes to the 'develop' branch.
• To fix defects on a release branch, use the release branch merge workflow.