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

Commit 865e616

Browse files
committed
docs: fix github markdown styling
From #56
1 parent a9e5721 commit 865e616

1 file changed

Lines changed: 42 additions & 42 deletions

File tree

MERGE_ELEMENT.md

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,81 +2,81 @@
22

33
## Pre-requisites
44

5-
1. Review changes in [element-web releases](https://github.com/element-hq/element-web/releases)
5+
#### 1. Review changes in [element-web releases](https://github.com/element-hq/element-web/releases)
66

7-
1. Review any changes to the app's [config.json file](https://github.com/element-hq/element-web/blob/master/element.io/app/config.json)
7+
#### 2. Review any changes to the app's [config.json file](https://github.com/element-hq/element-web/blob/master/element.io/app/config.json)
88

9-
1. Sync js-sdk fork [elecordapp/matrix-js-sdk](https://github.com/elecordapp/matrix-js-sdk)
9+
#### 3. Sync js-sdk fork [elecordapp/matrix-js-sdk](https://github.com/elecordapp/matrix-js-sdk)
1010

11-
> [!NOTE]
12-
> Create a [backup branch](https://github.com/elecordapp/matrix-js-sdk/branches) before syncing the upstream
11+
> [!NOTE]
12+
> Create a [backup branch](https://github.com/elecordapp/matrix-js-sdk/branches) before syncing the upstream
1313
1414
## Merge
1515

16-
1. Create a new branch named `element-v1.xx.xx`
16+
#### 1. Create a new branch named `element-v1.xx.xx`
1717

18-
> [!IMPORTANT]
19-
> Run `gitrm.sh` to ensure elecord hasn't added back any upstream files
18+
> [!IMPORTANT]
19+
> Run `gitrm.sh` to ensure elecord hasn't added back any upstream files
2020
21-
1. Merge the upstream master branch
21+
#### 2. Merge the upstream master branch
2222

23-
> [!TIP]
24-
> Using GitHub Desktop
25-
> - Select `Choose a branch to merge into element-v1.xx.xx`
26-
> - Select `upstream/master`
27-
> - Select `Create a merge commit`
23+
> [!TIP]
24+
> Using GitHub Desktop
25+
> - Select `Choose a branch to merge into element-v1.xx.xx`
26+
> - Select `upstream/master`
27+
> - Select `Create a merge commit`
2828
29-
1. Resolve merge conflicts
29+
#### 3. Resolve merge conflicts
3030

31-
> [!IMPORTANT]
32-
> Run `gitrm.sh` to discount previously removed upstream files
31+
> [!IMPORTANT]
32+
> Run `gitrm.sh` to discount previously removed upstream files
3333
34-
> [!TIP]
35-
> Always use the branch file for...
36-
> - CHANGELOG.md
37-
> - README.md
38-
> <br><br>
39-
>
40-
> Always use the upstream file for...
41-
> - yarn.lock
34+
> [!TIP]
35+
> Always use the branch file for...
36+
> - CHANGELOG.md
37+
> - README.md
38+
> <br><br>
39+
>
40+
> Always use the upstream file for...
41+
> - yarn.lock
4242
43-
> [!WARNING]
44-
> Don't use the `package.json` branch file, instead resolve merge conflicts as there might be unseen changes
43+
> [!WARNING]
44+
> Don't use the `package.json` branch file, instead resolve merge conflicts as there might be unseen changes
4545
46-
1. Complete the merge process
46+
#### 4. Complete the merge process
4747

4848
## Review
4949

50-
1. Check for any new files added or unwanted changes
50+
#### 1. Check for any new files added or unwanted changes
5151

52-
> [!NOTE]
53-
> You can amend the merge commit as needed
52+
> [!NOTE]
53+
> You can amend the merge commit as needed
5454
55-
1. Build the app locally and test
55+
#### 2. Build the app locally and test
5656

57-
1. Commit the yarn.lock file `chore: update yarn.lock`
57+
#### 3. Commit the yarn.lock file `chore: update yarn.lock`
5858

59-
> [!WARNING]
60-
> Only include additions, no local paths or minified package locks
59+
> [!WARNING]
60+
> Only include additions, no local paths or minified package locks
6161
62-
1. Commit any required regression fixes
62+
#### 4. Commit any required regression fixes
6363

64-
> [!NOTE]
65-
> Any commits made to this branch won't be included in the changelog
64+
> [!NOTE]
65+
> Any commits made to this branch won't be included in the changelog
6666
67-
1. Publish the branch
67+
#### 5. Publish the branch
6868

6969
## Pull Request
7070

71-
1. Create a pull request named `Element v1.xx.xx`
71+
#### 1. Create a pull request named `Element v1.xx.xx`
7272

7373
> Merge upstream Element-web v1.11.xx-yy.
7474
> - Bundles new feature A
7575
> - Adds important feature B
7676

77-
1. Test the app
77+
#### 2. Test the app
7878

79-
1. Merge (don’t squash)
79+
#### 3. Merge (don’t squash)
8080

8181
<br>
8282

0 commit comments

Comments
 (0)