8000 Updated branch policy by evildmp · Pull Request #6320 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Updated branch policy #6320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 6, 2019
Merged

Updated branch policy #6320

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90c977f
Updated branch policy
evildmp Mar 22, 2018
6d29e88
Removed feature branch notes from policy
evildmp Mar 29, 2018
1050f5d
Merge branch 'develop' into branchesdocs
evildmp May 3, 2018
041bcab
Merge branch 'develop' into branchesdocs
vthaian Mar 20, 2019
13724f0
Merge branch 'develop' into branchesdocs
FinalAngel Aug 7, 2019
8c8d708
Merge branch 'develop' into branchesdocs
FinalAngel Nov 6, 2019
7749ae5
Merge branch 'develop' into branchesdocs
FinalAngel Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed feature branch notes from policy
  • Loading branch information
@evildmp
evildmp committed Mar 29, 2018
commit 6d29e8892bac04bacc51b5fea23715209c7a70c4
4 changes: 0 additions & 4 deletions docs/contributing/development-policies.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ the latest (highest-numbered) ``release/x.y.z``
This is the branch that will become the next release on PyPI. ``develop`` will be merged into ``release/x.y.z``
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop is/should never be merged into release/x.y.z, instead commits are cherry-picked

regularly.

``feature`` branches
Occasionally the development team may decide to open a ``feature`` branch for work on **new features and
backwards-incompatible changes** that by their nature require more substantial team co-ordination.

Older ``release/x.y.z`` branches
These represent the final point of development (the highest ``y`` of older versions). Releases in the full set of
older versions have been tagged (use Git Tags to retrieve them).
Expand Down
0