glauesppen commented on code in PR #354: URL: https://github.com/apache/incubator-wayang/pull/354#discussion_r1378614268
########## wayang-docs/src/main/resources/how_contribute/code_changes/preparing_contribute_code_changes/branching_strategy.md: ########## @@ -0,0 +1,58 @@ +--- +license: | + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +layout: default +title: "Branching Strategy" +previous: + url: /how_contribute/code_changes/code_review_criteria/ + title: Code Review Criteria +next: + url: /how_contribute/code_changes/preparing_contribute_code_changes/jira_issue/ + title: Jira issues +--- +# Apache Wayang-Branching Strategy +This page is a summary from an email thread: https://lists.apache.org/thread/v9nhw3ml585456byd6t6cbn3vbhnzkww + +## Branches: +__*release (formerly main):*__ + +This branch represents the current stable state of Wayang. It's where users can find the latest and most stable version of the project. The content of this branch is the same as the latest "rel/x.x.x" branch. + + +__*rel/x.x.x (Release Version Branches):*__ + +These branches are used to track all versions of Wayang. Older versions are kept here for reference and use, similar to tags. For example, if you need to use an older version of Wayang, you can find it here. + + +__*cherry-pick (Feature/Fix Selection):*__ + +This branch is used when selecting specific features and fixes implemented on the "develop" branch to be included in the next release. It allows for testing and ensuring compatibility with Apache guidelines before creating the "rel/" branch. + + +__*develop (Development Branch):*__ + +This branch is where approved pull requests (PRs) are merged, but it may not always be stable. New content is frequently opened and merged here. Developers work on new features or bug fixes by creating new "feature/bugfix" branches from "develop." + +## Workflow: +Developers work primarily on the develop branch, where they create and merge PRs for new features or bug fixes. +When it's time to make a new release, features and fixes implemented on develop are cherry-picked into the cherry-pick branch. Testing and compliance with Apache guidelines are performed. +After successful testing and compliance, the rel/x.x.x branch is created using Maven commands. +Once the rel/x.x.x branch conforms to Apache approvals, its content is merged into the release (formerly main) branch. This provides an easy and intuitive way for users to find the latest stable version of Wayang. + + +## Default Branch in GitHub: +The default branch in the GitHub repository can be set to develop to reflect the most active development branch. This makes it easier for contributors to find the primary development branch. Review Comment: Let's change the branch name to "main" ########## wayang-docs/src/main/resources/how_contribute/code_changes/preparing_contribute_code_changes/branching_strategy.md: ########## @@ -0,0 +1,58 @@ +--- +license: | + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +layout: default +title: "Branching Strategy" +previous: + url: /how_contribute/code_changes/code_review_criteria/ + title: Code Review Criteria +next: + url: /how_contribute/code_changes/preparing_contribute_code_changes/jira_issue/ + title: Jira issues +--- +# Apache Wayang-Branching Strategy +This page is a summary from an email thread: https://lists.apache.org/thread/v9nhw3ml585456byd6t6cbn3vbhnzkww + +## Branches: +__*release (formerly main):*__ + +This branch represents the current stable state of Wayang. It's where users can find the latest and most stable version of the project. The content of this branch is the same as the latest "rel/x.x.x" branch. + + +__*rel/x.x.x (Release Version Branches):*__ + +These branches are used to track all versions of Wayang. Older versions are kept here for reference and use, similar to tags. For example, if you need to use an older version of Wayang, you can find it here. + + +__*cherry-pick (Feature/Fix Selection):*__ + +This branch is used when selecting specific features and fixes implemented on the "develop" branch to be included in the next release. It allows for testing and ensuring compatibility with Apache guidelines before creating the "rel/" branch. + + +__*develop (Development Branch):*__ Review Comment: After some consideration, we will use the "main" branch to be the one where we will merge our PRs and open new branches. ########## wayang-docs/src/main/resources/how_contribute/code_changes/preparing_contribute_code_changes/branching_strategy.md: ########## @@ -0,0 +1,58 @@ +--- +license: | + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +layout: default +title: "Branching Strategy" +previous: + url: /how_contribute/code_changes/code_review_criteria/ + title: Code Review Criteria +next: + url: /how_contribute/code_changes/preparing_contribute_code_changes/jira_issue/ + title: Jira issues +--- +# Apache Wayang-Branching Strategy +This page is a summary from an email thread: https://lists.apache.org/thread/v9nhw3ml585456byd6t6cbn3vbhnzkww + +## Branches: +__*release (formerly main):*__ Review Comment: We changed a bit to simplify the process and we will not have a branch called "release" for now. Only the rel/x.x.x -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
