Skip to content

Commit ea84df8

Browse files
authored
docs: update MAINTENANCE to include practices of merging multiple release-dev branches
1 parent f8a26c4 commit ea84df8

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

MAINTENANCE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ When merging a complete `release-dev` branch into `main` after a major feature i
6060
- Example: `release-dev/feature -> [merge commit] -> main`
6161

6262

63+
#### 3. Merge multiple release-dev branches
64+
65+
A release may contain multiple features that each is developed on its own `release-dev/*` branch.
66+
67+
When merging to `main`, atomic commits on each `release-dev/*` branch should be preserved, in order to track commit history of each individual feature scope in the release.
68+
69+
This can be achieved by either merge commit each `release-dev/*` branch into `main` respectively, or merge commit into a single `release-dev/*` branch (consolidation) then commit merge the single one into `main`.
70+
71+
6372
### Best Practices
6473

6574
- **Branch Hygiene**: Delete branches after merging to avoid clutter

0 commit comments

Comments
 (0)