forked from richard-evans/vampire
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.vampire_git_branches
40 lines (27 loc) · 1.54 KB
/
.vampire_git_branches
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
Vampire uses the following main branches:
(maint): - updates for previous release
master: - current release in progress
new: - completed features for inclusion in release after next
new is a superset of master is a superset of maint. NEVER merge from maint to master or master to new!
New ideas should be developed in a dedicated branch forked from master for current release topics, and from new for release after next.
----------------------------------------------------------------------------------------------------------------------------------------
git checkout -b new_feature_name
git push origin new_feature_name
Once completed and tested this can be merged with new and staged for later inclusion with master.
(on branch master"git merge new_feature")
At this point the initial development branch should be deleted.
o---o---o---o---o---o---o maint
\ /
\ /
o---o---o---o---o---o--o master -------------o
\ \ / /
\ \ / /
\ o----o---o current feature /
\ /
\ /
o---o---o----o new ----------o
Checkout remote branch to work on locally
---------------------------------------------------------------------------------------------------------------------
By default git checks out master branch. To checkout another branch from the repository first create a
local branch and then link to the original:
git checkout -b local-name origin/remote-name