Branches: Difference between revisions
No edit summary |
No edit summary |
||
Line 27: | Line 27: | ||
==1. |
==1. Create a new development branch from master== |
||
<pre> |
<pre> |
||
Line 34: | Line 34: | ||
</pre> |
</pre> |
||
==2. |
==2. Develop code== |
||
The develop branch is used for continuous code development and for working out conflicts when merging features that were on a separate branch. Only when the code is functional enough can it be considered as a release candidate (see Releases below). |
The develop branch is used for continuous code development and for working out conflicts when merging features that were on a separate branch. Only when the code is functional enough can it be considered as a release candidate (see Releases below). |
||
Line 57: | Line 57: | ||
<pre> |
<pre> |
||
git push |
git push |
||
</pre> |
|||
==3 Releases== |
|||
When the code in the develop branch is functional and without major bugs it can be considered as a release candidate. |
|||
===3.1 Create Release branch=== |
|||
If not done so already, create a new Release branch from develop. |
|||
<pre> |
|||
git branch release |
|||
git push --set-upstream origin release |
|||
</pre> |
</pre> |
Revision as of 02:40, 9 February 2024
Git branch model
- develop
- feature
- release
- master
Some basic rules for successful development using branches:
- master only gets updated from release
- develop is the main working branch
- develop is the source for new releases and features
- features can only go back into develop
resource: https://nvie.com/posts/a-successful-git-branching-model/
1. Create a new development branch from master
git branch develop git push --set-upstream origin develop
2. Develop code
The develop branch is used for continuous code development and for working out conflicts when merging features that were on a separate branch. Only when the code is functional enough can it be considered as a release candidate (see Releases below).
2.1 set up develop environment
When developing code for a website, it may be wise to clone the project into a new folder so as not to mess with the live/production 'master' environment
git clone git@gitserver:myproject myproj_dev cd myproj_dev git checkout develop
2.1 commit code
After you have developed your code and completed some logical component it is wise to commit the changes to the repository to make it easier for future code revision and debugging.
git add . git commit -m <commit message>
2.2 upload commit to server
When a remote repository is available it is good practice to also upload the latest commit so everyone else can get access to the most recent changes in code.
git push
3 Releases
When the code in the develop branch is functional and without major bugs it can be considered as a release candidate.
3.1 Create Release branch
If not done so already, create a new Release branch from develop.
git branch release git push --set-upstream origin release