Skip to content

Commit e4091ac

Browse files
committed
Switch to single trunk branch.
1 parent 33f0b91 commit e4091ac

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!-- Please confirm that your work is based on the correct branch. -->
2-
<!-- Bug fixes should be based on *trunk-patch*. -->
3-
<!-- Backwards compatible new features should be based on *trunk-minor*. -->
4-
<!-- Incompatible API changes should be based on *trunk-major*. -->
5-
61
## Description
72

83
<!-- Describe your changes in detail. -->
@@ -23,7 +18,7 @@ Resolves #???
2318

2419
## Checklist:
2520

26-
- [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-blue/blob/trunk-minor/CONTRIBUTING.rst).
27-
- [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-blue/blob/trunk-minor/ContributorAgreement.md).
21+
- [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-blue/blob/trunk/CONTRIBUTING.rst).
22+
- [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-blue/blob/trunk/ContributorAgreement.md).
2823
- [ ] My name is on the list of contributors (`sphinx-doc/credits.rst`) in the pull request source branch.
2924
- [ ] I have summarized these changes in `CHANGELOG.rst` following the established format.

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
push:
1111
branches:
12-
- "trunk-*"
12+
- "trunk"
1313
tags:
1414
- "v*"
1515

.github/workflows/style.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
push:
1313
branches:
14-
- "trunk-*"
14+
- "trunk"
1515

1616
jobs:
1717
prek:

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
push:
1212
branches:
13-
- "trunk-*"
13+
- "trunk"
1414

1515
workflow_dispatch:
1616

CONTRIBUTING.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ Version control
3434
Base your work off the correct branch
3535
_____________________________________
3636

37-
- Base backwards compatible bug fixes on ``trunk-patch``.
38-
- Base additional functionality on ``trunk-minor``.
39-
- Base API incompatible changes on ``trunk-major``.
37+
- Base bug fixes, new functionality, and API incompatible changes on ``trunk``.
4038

4139
Propose a minimal set of related changes
4240
________________________________________

0 commit comments

Comments
 (0)