Skip to content
This repository was archived by the owner on Feb 11, 2026. It is now read-only.

Commit 7c63a23

Browse files
committed
docs: update element merge guide
1 parent b363ff8 commit 7c63a23

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

MERGE_ELEMENT.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ Pre-requisites
66

77
---
88

9-
<br>
10-
119
1. Create a branch named 'element-v1.xx.xx'
1210

1311
1. Merge the upstream master branch
@@ -22,18 +20,26 @@ Pre-requisites
2220
> Use elecord file
2321
> - CHANGELOG.md
2422
> - README.md
25-
>
23+
2624
> Use upstream/master
2725
> - yarn.lock
2826
2927
1. Run the build locally
3028

3129
1. Commit the yarn lock ('chore: update yarn.lock')
3230

31+
1. Commit any required regression fixes
32+
33+
> [!NOTE]
34+
> Any commits made to this branch won't be included in the changelog
35+
3336
1. Publish the branch
3437

3538
1. Create a pull request ('Element v1.XX.XX')
3639

3740
1. Test the app
3841

3942
1. Merge (don’t squash)
43+
44+
> [!IMPORTANT]
45+
> elecord-desktop will also need to be updated

0 commit comments

Comments
 (0)