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
Copy file name to clipboardExpand all lines: contributing.md
+13-3Lines changed: 13 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -162,10 +162,20 @@ get acquainted with this development process.
162
162
163
163
1.**Choose a base branch.**
164
164
- If your changes will break API or ABI, then base your new branch off of `main`.
165
+
If this package's `main` branch is not part of the upcoming Gazebo collection,
166
+
create an issue on the package repository asking its `main` branch to be added
167
+
to the next collection.
168
+
For example, at the time this documentation is being written the upcoming Jetty
169
+
collection is [using the gz-cmake4 branch](https://github.com/gazebo-tooling/gazebodistro/blob/bc0de6a86d6ab84106f208395969353d43b18dac/collection-jetty.yaml#L6)
170
+
rather than `main`.
165
171
- If you are making interdependent changes to multiple repositories without
166
-
breaking API or ABI, it is also recommended to base your new branches off of `main`
167
-
to simplify automated testing of the changes and the review process. Your
168
-
changes may be backported to an existing release once all the changes
172
+
breaking API or ABI, it is recommended to base your new branches off of
173
+
the branch used in the upcoming collection
174
+
to simplify automated testing of the changes and the review process.
175
+
For example, at the time this documentation is being written the upcoming Jetty
0 commit comments