Merge pull request #291 from cadCAD-org/pre_release

v0.4.27: edited CONTRIBUTING.md
cadCAD-org · Aug 26, 2021 · f87b8ec · f87b8ec
2 parents 2e46c03 + 9fc3b00
commit f87b8ec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,14 +31,14 @@ Contributing to an existing feature:
 7. PR is queued for review
 8. PR Reviewed (Update necessary if rejected)
 9. PR Approved (There may be circumstances delaying the merge.)
-10. Your contribution merged into next feature release on `org:main`
+10. Your contribution merged into next feature release on `org:master`
 
 ### Recommended Strategy: [Rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)
 1. Add cadCAD-org/cadCAD as remote within you forked project locally.
-2. `git checkout remote/main`
-3. `git pull remote main`
+2. `git checkout remote/master`
+3. `git pull remote master`
 4. `git checkout your_branch`
-5. `git rebase main`
+5. `git rebase master`
 6. Resolve merge conflicts (while leveraging rebase commands)
 7. `git push fork your_branch`