| ... | ... | @@ -23,7 +23,7 @@ Login as yourself (beamline or personal computer): |
|
|
|
## Workflow for code development
|
|
|
|
|
|
|
|
|
|
|
|
### Sync and create new branch:
|
|
|
|
### Sync and create new branch
|
|
|
|
|
|
|
|
```
|
|
|
|
1. git checkout main # switch and/or make sure you are on the “main” branch
|
| ... | ... | @@ -32,7 +32,7 @@ Login as yourself (beamline or personal computer): |
|
|
|
4. git checkout -b branchX # create new branch from “main” named branchX and switch to it
|
|
|
|
```
|
|
|
|
|
|
|
|
### Make your changes:
|
|
|
|
### Make your changes
|
|
|
|
|
|
|
|
Commit changes regularly; think atomique commits (commit files one by one vs big all-together combined commit):
|
|
|
|
|
| ... | ... | @@ -50,7 +50,7 @@ or, from VSCode: |
|
|
|
4. use curved arrow to undo changes
|
|
|
|
|
|
|
|
|
|
|
|
### When done for the day:
|
|
|
|
### When done for the day
|
|
|
|
|
|
|
|
```
|
|
|
|
git push # push changes to GitLab
|
| ... | ... | @@ -61,7 +61,7 @@ Then, from GitLab or VSCode: |
|
|
|
|
|
|
|
---------------------------------------
|
|
|
|
|
|
|
|
## Some tips:
|
|
|
|
## Some tips
|
|
|
|
|
|
|
|
- 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
|
| ... | ... | |