diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56cf5ec..c21f8f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,10 +95,10 @@ Before you submit your Pull Request (PR) consider the following guidelines: 4. In your forked repository, make your changes in a new git branch: ```shell - git checkout -b my-fix-branch develop + git checkout -b my-fix-branch main ``` -### The default branch is develop! +### The default branch is main 5. Create your patch, **including appropriate test cases**. @@ -120,7 +120,7 @@ Before you submit your Pull Request (PR) consider the following guidelines: git push origin my-fix-branch ``` -10. In GitHub, send a pull request to `AnguHashBlog/analog-material:develop`. +10. In GitHub, send a pull request to `AnguHashBlog/analog-material:main`. **DO NOT** erase the provided PR template! It is intended for you to use, not to replace it with random text. @@ -140,10 +140,10 @@ After your pull request is merged, you can safely delete your branch and pull th git push origin --delete my-fix-branch ``` -- Check out the develop branch: +- Check out the main branch: ```shell - git checkout develop -f + git checkout main -f ``` - Delete the local branch: @@ -152,10 +152,10 @@ After your pull request is merged, you can safely delete your branch and pull th git branch -D my-fix-branch ``` -- Update your local `develop` with the latest upstream version: +- Update your local `main` with the latest upstream version: ```shell - git pull --ff upstream develop + git pull --ff upstream main ``` ## Coding Rules diff --git a/package-lock.json b/package-lock.json index 0fa91ed..c902e6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25480,9 +25480,9 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", - "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "dev": true, "engines": { "node": ">=10.0.0"