Replies: 2 comments 2 replies
-
Just understood the logic of prerelease branches in https://github.com/rdswift/picard-docs/wiki/Repository-Structure now. So we would gather these changes for a upcoming release in a branch (as we had done in the past) and merge them to master once the release is done. This works for me well. |
Beta Was this translation helpful? Give feedback.
-
Yeah, we really didn't have a good discussion forum for this stuff. This was the simplest option.
Ideally, yes, but it can always be created later if necessary as long as we can identify the point where the new release took over. That should be pretty easy. Thinking about it some more, I may actually change that to simply add a tag to the
Exactly right. The
Me too. The simpler we can make this, the less likely someone will misunderstand and do something unintended. I think that the automation is mostly bulletproof, but there's always something that has been missed that could come back to bite us. |
Beta Was this translation helpful? Give feedback.
-
@rdswift This is about your questions on IRC. Great thing you enabled discussions here, I think for the docs it might be really useful as we otherwise lack a proper place for these discussions.
About https://github.com/rdswift/picard-docs/wiki/Publishing-a-New-Version is looking good to me. Only I am not sure about how the specific branches are handled.
Basically when doing a new minor number release (2.6, replacing previous 2.5.x) I would add a branch for 2.5 to retain the ability to update it individually if needed. But otherwise we push changes only to the master branch, right?
What if we want to prepare changes for an upcoming release, that we want to have shown in "latest", but not in the actual latest 2.x docs? E.g. we are still on 2.5, but we add some feature for Picard 2.6 we want to get documented. Would I then create a 2.5 branch (to allow updating the 2.5 path), then change the version to e.g. 2.6.0dev1, add the documentation changes and push this to master? This would then have latest include the changes, but 2.5 path not, right?
If this works, the process would work very well. I like it that we do most changes on a single branch (master), instead of having to maintain always multiple branches and merge between them.
Beta Was this translation helpful? Give feedback.
All reactions