@@ -13,13 +13,14 @@ today! Here are the guidelines we'd like you to follow:
1313## <a name =" submit-pr " ></a > Merge Request Submission Guidelines
1414Before you submit your merge request consider the following guidelines:
1515
16- * Search [ GitLab] ( https://orsc.dev/open-rsc/Game /merge_requests ) for an open or closed Merge Request
16+ * Search [ GitLab] ( https://gitlab.com/openrsc/openrsc /merge_requests ) for an open or closed Merge Request
1717 that relates to your submission. You don't want to duplicate effort.
18+ * Create a [ fork] ( https://gitlab.com/openrsc/openrsc/-/forks/new ) of this repository.
1819* Create the [ development environment] ( #install )
1920* Make your changes in a new git branch:
2021
2122 ``` shell
22- git checkout -b my-fix-branch master
23+ git checkout -b my-fix-branch develop
2324 ```
2425
2526* Create your patch commit.
@@ -48,7 +49,7 @@ Before you submit your merge request consider the following guidelines:
4849 You can also amend the initial commits and force push them to the branch.
4950
5051 ` ` ` shell
51- git rebase master -i
52+ git rebase develop -i
5253 git push origin my-fix-branch -f
5354 ` ` `
5455
@@ -66,10 +67,10 @@ from the main (upstream) repository:
6667 git push origin --delete my-fix-branch
6768 ` ` `
6869
69- * Check out the master branch:
70+ * Check out the develop branch:
7071
7172 ` ` ` shell
72- git checkout master -f
73+ git checkout develop -f
7374 ` ` `
7475
7576* Delete the local branch:
@@ -78,10 +79,10 @@ from the main (upstream) repository:
7879 git branch -D my-fix-branch
7980 ` ` `
8081
81- * Update your master with the latest upstream version:
82+ * Update your develop with the latest upstream version:
8283
8384 ` ` ` shell
84- git pull --ff upstream master
85+ git pull --ff upstream develop
8586 ` ` `
8687
8788# # <a name="software"></a> Suggested Developer Software
0 commit comments