You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
[](https://colprac.sciml.ai/)
*A domain-specific language and backend for probabilistic programming, used by [Turing.jl](https://github.com/TuringLang/Turing.jl).*
15
14
@@ -29,24 +28,21 @@ If you feel you have some relevant skills and are interested in contributing, pl
29
28
30
29
### Contributor's Guide
31
30
32
-
This project follows the [](https://colprac.sciml.ai/), apart from the following slight variation:
31
+
This project follows the [](https://colprac.sciml.ai/), apart from the following slight variation:
33
32
34
-
- The master branch contains the most recent release at any point in time. All non-breaking changes (bug fixes etc.) are merged directly into master and a new patch version is released immediately.
35
-
- A separate dev branch contains all breaking changes, and is merged into master when a minor version release happens.
33
+
- The master branch contains the most recent release at any point in time. All non-breaking changes (bug fixes etc.) are merged directly into master and a new patch version is released immediately.
34
+
- A separate dev branch contains all breaking changes, and is merged into master when a minor version release happens.
36
35
37
36
For instance, suppose we are currently on version 0.13.5.
38
37
39
-
- If someone produces a bug fix, it is merged directly into master and bumps the version to 0.13.6. This change is also merged into dev so that it remains up-to-date with master.
40
-
- If someone is working on a new feature that is not breaking (performance-related, fancy new syntax that is backwards-compatible etc.), the same happens.
41
-
- New breaking changes are merged into dev until a release is ready to go, at which point dev is merged into master and version 0.14 is released.
38
+
- If someone produces a bug fix, it is merged directly into master and bumps the version to 0.13.6. This change is also merged into dev so that it remains up-to-date with master.
39
+
- If someone is working on a new feature that is not breaking (performance-related, fancy new syntax that is backwards-compatible etc.), the same happens.
40
+
- New breaking changes are merged into dev until a release is ready to go, at which point dev is merged into master and version 0.14 is released.
42
41
43
-
### Bors
42
+
### Merge Queue
44
43
45
-
This project uses [Bors](https://bors.tech/) for merging PRs. Bors is a Github bot that prevents merge skew / semantic merge conflicts by testing
46
-
the exact integration of pull requests before merging them.
44
+
This project uses a [merge queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) for merging PRs.
45
+
In this way, merge skew / semantic merge conflicts are prevented by testing the exact integration of pull requests before merging them.
47
46
48
-
When a PR is good enough for merging and has been approved by at least one reviewer, instead of merging immediately, it is added to the merge queue
49
-
by commenting with `bors r+`. The Bors bot merges the pull request into a staging area, and runs the CI tests. If tests pass, the commit in the staging
50
-
area is copied to the target branch (i.e., usually master).
51
-
52
-
PRs can be tested by adding a comment with `bors try`. Additional commands can be found in the [Bors documentation](https://bors.tech/documentation/).
47
+
When a PR is good enough for merging and has been approved by at least one reviewer, instead of merging immediately, it is added to the merge queue.
48
+
If the CI tests pass, including downstream tests of Turing, the PR is merged into the main branch.
0 commit comments