| ... | @@ -55,24 +55,23 @@ or, from VSCode: |
... | @@ -55,24 +55,23 @@ or, from VSCode: |
|
|
```
|
|
```
|
|
|
git push # push changes to GitLab
|
|
git push # push changes to GitLab
|
|
|
```
|
|
```
|
|
|
|
|
Then, from GitLab or VSCode:
|
|
|
On GitLab
|
|
- create pull request for your branch
|
|
|
- create pull request
|
|
- JM will review the changes and merge into main as needed.
|
|
|
- JM will review the changes and merge to main as needed.
|
|
|
|
|
|
|
|
|
|
---------------------------------------
|
|
---------------------------------------
|
|
|
## Some tips:
|
|
## Some tips:
|
|
|
|
|
|
|
|
- You can open more than one window in VSCode
|
|
- You can open more than one window in VSCode
|
|
|
- To see preview of Mardown files side by side use extension “Auto-Open Markdown preview”: type Shift+cmd+X to open the extension marketplace; look for Auto-Open Markdown preview and install
|
|
- To see preview of Mardown files side by side use extension “Auto-Open Markdown preview”: type Shift+cmd+X to open the extension marketplace; look for Auto-Open Markdown preview and install
|
|
|
- Only click once to open file from the side bar or it will open file as many time as you clicked (can be changed in settings)
|
|
- Only click once to open file from the side bar or it will open file as many time as you clicked (can be changed in settings)
|
|
|
- You can quickly end up with too many files open; you can use ”open editor” to close / reorganize
|
|
- You can quickly end up with too many files open; you can use ”open editor” to close / reorganize
|
|
|
- You can see the list of functions and variables for a given file in “outline”; collapse all to see only the functions
|
|
- You can see the list of functions and variables for a given file in “outline”; collapse all to see only the functions
|
|
|
- Timeline shows commit messages for a given file
|
|
- Timeline shows commit messages for a given file
|
|
|
- The letter on the side of a files indicates uncommitted changes:
|
|
- The letter on the side of a files indicates uncommitted changes:
|
|
|
M = modified; D = deleted; U = untracked (only for new files)
|
|
M = modified; D = deleted; U = untracked (only for new files)
|
|
|
- Each commit is identified by a unique 40 characters ID called called “sha”: typically only the first 6 to 8 character are displayed; this is a good way to check where you are
|
|
- Each commit is identified by a unique 40 characters ID called called “sha”: typically only the first 6 to 8 character are displayed; this is a good way to check where you are
|
|
|
- To see the list of branch: git branch
|
|
- To see the list of branch: git branch
|
|
|
- more info: https://www.atlassian.com/git/tutorials/using-branches
|
|
- more info: https://www.atlassian.com/git/tutorials/using-branches
|
|
|
|
|
|
|
|
|
|
|
|
|
|
\ No newline at end of file |