File tree Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Expand file tree Collapse file tree 2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ Agreement. You can do so by going to https://cla.salesforce.com/sign-cla.
27
27
## Branches
28
28
29
29
- We work in ` develop ` .
30
- - Our released (aka. _ production_ ) branch is ` master ` .
30
+ - Our released (aka. _ production_ ) branch is ` main ` .
31
31
- Our work happens in _ topic_ branches (feature and/or bug-fix).
32
32
- feature as well as bug-fix branches are based on ` develop `
33
33
- branches _ should_ be kept up-to-date using ` rebase `
@@ -47,17 +47,17 @@ Agreement. You can do so by going to https://cla.salesforce.com/sign-cla.
47
47
- Hot-fix branches are an exception.
48
48
- Instead we aim for faster cycles and a generally stable ` develop ` branch.
49
49
50
- ### Merging ` develop ` into ` master `
50
+ ### Merging ` develop ` into ` main `
51
51
52
- - When a development cycle finishes, the content of the ` develop ` branch will become the ` master ` branch
52
+ - When a development cycle finishes, the content of the ` develop ` branch will become the ` main ` branch
53
53
54
54
```
55
- $ git checkout master
55
+ $ git checkout main
56
56
$ git reset --hard develop
57
57
$
58
58
$ # Using a custom commit message for the merge below
59
- $ git merge -m 'Merge -s our (where _ours_ is develop) releasing stream x.y.z.' -s ours origin/master
60
- $ git push origin master
59
+ $ git merge -m 'Merge -s our (where _ours_ is develop) releasing stream x.y.z.' -s ours origin/main
60
+ $ git push origin main
61
61
```
62
62
63
63
## Pull Requests
Original file line number Diff line number Diff line change 1
- [ ![ CircleCI] ( https://circleci.com/gh/forcedotcom/lightning-language-server/tree/master.svg?style=svg )] ( https://circleci.com/gh/forcedotcom/lightning-language-server/tree/master )
1
+ [ ![ CircleCI] ( https://circleci.com/gh/forcedotcom/lightning-language-server/tree/master.svg?style=svg )] ( https://circleci.com/gh/forcedotcom/lightning-language-server/tree/main )
2
2
[ ![ License] ( https://img.shields.io/badge/License-BSD%203--Clause-blue.svg )] ( https://opensource.org/licenses/BSD-3-Clause ) <br />
3
3
[ ![ npm (scoped)] ( https://img.shields.io/npm/v/@salesforce/lwc-language-server?label=lwc-language-server&logo=npm )] ( https://www.npmjs.com/package/@salesforce/lwc-language-server )
4
4
[ ![ npm (scoped)] ( https://img.shields.io/npm/v/@salesforce/aura-language-server?label=aura-language-server&logo=npm )] ( https://www.npmjs.com/package/@salesforce/aura-language-server )
@@ -61,7 +61,7 @@ Click button 'Open Workspace'
61
61
62
62
### Debugging with VSCode
63
63
64
- Run 'Launch DX - Aura & LWC' from the VSCode debug view (its the last one in that long list).
64
+ Run 'Launch DX - Aura & LWC' from the VSCode debug view (its the last one in that long list).
65
65
66
66
### Recompile on change
67
67
@@ -79,14 +79,14 @@ Easiest way to do this is to kill the vscode client and hit F5 to relaunch your
79
79
80
80
### Automated publish to NPM
81
81
Automated deploys to NPM will occur weekly on Sundays @midnight via CircleCI.
82
- https://circleci.com/gh/forcedotcom/lightning-language-server/tree/master
82
+ https://circleci.com/gh/forcedotcom/lightning-language-server/tree/main
83
83
84
84
### On-Demand publish to NPM
85
- If you want to have CircleCI publish the current master branch to NPM, you can run the following script to trigger the deploy job to run:
85
+ If you want to have CircleCI publish the current main branch to NPM, you can run the following script to trigger the deploy job to run:
86
86
87
87
```
88
88
curl -v -u ${CircleCIToken}: -X POST --header "Content-Type: application/json" -d '{
89
- "branch": "master ",
89
+ "branch": "main ",
90
90
"parameters": {
91
91
"deploy": true,
92
92
"version": "patch"
You can’t perform that action at this time.
0 commit comments