Skip to content

Commit baab7bd

Browse files
committed
Update branching strategy description
1 parent cd44ad3 commit baab7bd

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@ Open both repositories ([DocFX Site Builder](https://github.com/IgniteUI/igniteu
4848
# <a name='#fixing'> Fixing bugs and adding new samples</a>
4949
## <a name='#bug'> Bug fixing guidelines</a>
5050

51-
1. Depending on where the bug was found `the current version` or the `ongoing release version`, checkout a development branches from `vNext` or/and `master` branch. `vNext` is the version that is going to be used upon release (next version), and `master` is the branch with the current state (current version). If the change/fix is applicable only to the ongoing release branch (`vNext`) there is no need to cherry-pick to `master` branch as the change/fix/feature will be pushed to `master` branch upon release.
51+
1. Depending on where the bug was found `the current version` or the `ongoing release version`, checkout a development branches from `vNext` or/and `master` branch. `vNext` is the version that is going to be used upon release (next version), and `master` is the branch with the current state (current version available on production). If the change/fix is applicable only to the ongoing release branch (`vNext`) there is no need to cherry-pick to `master` branch as the change/fix/feature will be pushed to `master` branch upon release.
5252
2. Run lint
5353
3. Pull request your changes and reference the issue. Use the enforced commit message format with applicable type, scope, etc.
5454
4. Don't forget to make the necessary status updates, as described in the workflow section.
5555

56-
**Example workflow**
57-
When bug fixes are applicable to both `vNext` and `master` branches the process will look like this:
56+
> Note: Cherry-pick to `master` branch only changes with **high priority**. There is no need to cherry-pick into `master` every bug fix/change from `vNext`> A regular mass merge PRs are going to be made from `vNext` into `master`.
57+
58+
**Example workflow for a bug with high priority**
59+
The process will look like this:
5860

5961
1. Checkout new branch from `vNext`. For code example purposes let's say the new branch is called `fixing-bug-5423-vNext`.
6062
2. Commit your changes to your `fixing-bug-5423-vNext` branch.

0 commit comments

Comments
 (0)