... | @@ -14,9 +14,9 @@ The proper procedure to editing code for the first time is: |
... | @@ -14,9 +14,9 @@ The proper procedure to editing code for the first time is: |
|
1. `git checkout master` ( if you aren't in master already)
|
|
1. `git checkout master` ( if you aren't in master already)
|
|
2. `git pull` (get all recent changes... do it anyway.. it will just say it's up to date if no changes are found )
|
|
2. `git pull` (get all recent changes... do it anyway.. it will just say it's up to date if no changes are found )
|
|
3. `git checkout -b some_new_branch_name` (might take a few seconds, it makes a branch and switches to it)
|
|
3. `git checkout -b some_new_branch_name` (might take a few seconds, it makes a branch and switches to it)
|
|
Then `git push --set-upstream origin some_new_branch_name` (... just do it.. or google it)
|
|
4. `git push --set-upstream origin some_new_branch_name` (... just do it.. or google it)
|
|
4. edit the code.
|
|
5. edit the code.
|
|
5. hit F8 if Blender is running, to test the changes.
|
|
6. hit F8 if Blender is running, to test the changes.
|
|
|
|
|
|
#### returning to your branch at a later stage
|
|
#### returning to your branch at a later stage
|
|
|
|
|
... | @@ -30,4 +30,4 @@ if you have uncommitted code, then you have several options but let's stick to j |
... | @@ -30,4 +30,4 @@ if you have uncommitted code, then you have several options but let's stick to j |
|
- `git commit -am "post code commit"`
|
|
- `git commit -am "post code commit"`
|
|
- `git push`
|
|
- `git push`
|
|
|
|
|
|
Now you are free to keep editing code. |
|
Now you are free to change branch to master (and pull) or to keep editing code. |
|
\ No newline at end of file |
|
\ No newline at end of file |