File tree Expand file tree Collapse file tree 2 files changed +10
-4
lines changed Expand file tree Collapse file tree 2 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -68,6 +68,11 @@ int main(void)
6868 return 0;
6969}
7070```
71-
71+
7272Refer to the [ Quick Start Guide] ( http://github.com/thrust/thrust/wiki/Quick-Start-Guide ) page for further information and examples.
7373
74+ Development process
75+ -------------------
76+
77+ For information on development process and branching, see [ this document] ( doc/branching.md ) .
78+
Original file line number Diff line number Diff line change @@ -64,7 +64,8 @@ The following branch names are used in the Thrust project:
6464 * ` github/maintenance/cuda-Z.W ` : the continuation of gitlab/staging/cuda-Z.W, but after release of CUDA Z.W, plus
6565 post-release fixes if any are needed (see "Old release branches" below).
6666 * ` gitlab/feature/<name> ` : feature branch for internally developed features.
67- * ` gitlab/bug/<bug-system><bug-name> ` : bug fix branch.
67+ * ` gitlab/bug/<bug-system>-<bug-id> ` : bug fix branch, where ` bug-system ` is ` github ` or ` nvbug ` . Permits a description
68+ after ` bug-id ` .
6869 * ` gitlab/master ` : same as ` github/master ` , but not yet published, during a freezing period (see "Feature freeze"
6970 below).
7071
@@ -75,8 +76,8 @@ The following branch names are used in the Thrust project:
7576During regular parts of the development cycle, when we develop features on feature branches, and fix bugs on the
7677main branch, we can:
7778
78- 1 . Merge internal fixes to ` github/master ` and to ` perforce/private ` .
79- 2 . Merge Github contributions to ` github/master ` and to ` perforce/private ` .
79+ * Merge internal fixes to ` github/master ` and to ` perforce/private ` .
80+ * Merge Github contributions to ` github/master ` and to ` perforce/private ` .
8081
8182### Feature freeze
8283
You can’t perform that action at this time.
0 commit comments