[
https://issues.apache.org/jira/browse/SOLR-10294?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15993065#comment-15993065
]
Cassandra Targett commented on SOLR-10294:
------------------------------------------
There have been no dissenting points of view on this issue, so I will take that
as agreement that the branching strategy will be the same as it is for code:
- "master" branch is where all changes are made
- changes are backported to version branches (such as "branch_6x")
- changes will also be backported to release branches (such as "branch_6_5") as
necessary
If there are no objections in the next day, I'll codify this in the meta-docs
for the Ref Guide (see the jira/solr-10290 branch,
solr/solr-ref-guide/meta-docs).
> Decide branching strategy for Ref Guide
> ---------------------------------------
>
> Key: SOLR-10294
> URL: https://issues.apache.org/jira/browse/SOLR-10294
> Project: Solr
> Issue Type: Sub-task
> Security Level: Public(Default Security Level. Issues are Public)
> Components: documentation
> Reporter: Cassandra Targett
>
> Since one of the reasons to move off Confluence is to provide online docs for
> specific versions of Solr, we should agree up front how we'll manage working
> with the branches.
> There are two general proposals on the table so far:
> # Make all changes in 'master' (trunk) and backport to branches for
> releasing the content. We'd need to merge "backward" into upcoming
> release branch.
> # Make all changes in branch_6x (or branch_7x, etc.) and only move
> things to master when they are only applicable to unreleased next
> major version. We'd merge 6x "forward" when it's time for next major
> version.
> Some discussion on this started in the mailing list, so I'll copy the
> feedback received so far on this as comments to this issue.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
