Skip to content

Commit 6474341

Browse files
jeffb-sfdcjag-j
authored andcommitted
fix: renamed master to main (forcedotcom#454)
1 parent 1292ee5 commit 6474341

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Agreement. You can do so by going to https://cla.salesforce.com/sign-cla.
2727
## Branches
2828

2929
- We work in `develop`.
30-
- Our released (aka. _production_) branch is `master`.
30+
- Our released (aka. _production_) branch is `main`.
3131
- Our work happens in _topic_ branches (feature and/or bug-fix).
3232
- feature as well as bug-fix branches are based on `develop`
3333
- 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.
4747
- Hot-fix branches are an exception.
4848
- Instead we aim for faster cycles and a generally stable `develop` branch.
4949

50-
### Merging `develop` into `master`
50+
### Merging `develop` into `main`
5151

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
5353

5454
```
55-
$ git checkout master
55+
$ git checkout main
5656
$ git reset --hard develop
5757
$
5858
$ # 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
6161
```
6262

6363
## Pull Requests

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
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)
22
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)<br/>
33
[![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)
44
[![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'
6161

6262
### Debugging with VSCode
6363

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).
6565

6666
### Recompile on change
6767

@@ -79,14 +79,14 @@ Easiest way to do this is to kill the vscode client and hit F5 to relaunch your
7979

8080
### Automated publish to NPM
8181
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
8383

8484
### 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:
8686

8787
```
8888
curl -v -u ${CircleCIToken}: -X POST --header "Content-Type: application/json" -d '{
89-
"branch": "master",
89+
"branch": "main",
9090
"parameters": {
9191
"deploy": true,
9292
"version": "patch"

0 commit comments

Comments
 (0)