Skip to content
GitLab
Explore
Sign in
Register
This is an archived project. Repository and other project resources are read-only.
Development
OpenFOAM-plus
Wiki
page code development
page code development
· Changes
Page history
WIKI: Code Development - updated structure to include the release branch
authored
May 06, 2016
by
Andrew Heather
Hide whitespace changes
Inline
Side-by-side
page-code-development.md
View page @
e3bbae77
# Code Development
# Code Development
## Repository Structure
## Repository Structure
There are 3 main branches
There are 4 main branches
-
master: always 'runnable' code, e.g. could be used by customers
-
release: latest code release
-
master: code updates since the last release, should always be runnable/stable code, e.g. could be used in production
-
develop: current developments, waiting to be pushed into the master
-
develop: current developments, waiting to be pushed into the master
-
foundation: mirror of the latest Foundation master branch merged from upstream
-
foundation: mirror of the latest Foundation master branch merged from upstream
## Wor
f
flow
## Wor
k
flow
Create a tracking branch to track the 'develop' branch if not already available:
Create a tracking branch to track the 'develop' branch if not already available:
-
git branch develop --track remotes/origin/develop
-
git branch develop --track remotes/origin/develop
...
...