Skip to content

Commit 2b00c5b

Browse files
authored
docs: change backmerge instructions in contribution docs
1 parent c1a70fe commit 2b00c5b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ The following changes are done in the `alpha` branch, before publishing the last
499499
3. Pull all remote branches into local branches.
500500
4. Create a new temporary branch `backmerge` on branch `release`.
501501
5. Create PR to merge `backmerge` into `beta`:
502-
- PR title: `<pr-name> [skip release]` where `<pr-name>` is the PR title of step 1.
502+
- PR title: `refactor: <commit-summary>` where `<commit-summary>` is the commit summary of step 1. The commit type needs to be `refactor`, otherwise the commit will show in the changelog of the `release` branch, once the `beta` branch is merged into release; this would a duplicate entry because the same changelog entry has already been generated when the PR was merged into the `release` branch in step 1.
503503
- PR description: (leave empty)
504504
6. Resolve any conflicts:
505505
- During back-merging, usually all changes are preserved; current changes come from the hotfix in the `release` branch, the incoming changes come from the `beta` branch usually being ahead of the `release` branch. This makes back-merging so complex and bug-prone and is the main reason why it should be avoided if possible.

0 commit comments

Comments
 (0)