Skip to content

Commit a4354b9

Browse files
committed
Quartz sync
1 parent 328e058 commit a4354b9

File tree

13 files changed

+52
-31
lines changed

13 files changed

+52
-31
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.9.0

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
public
2+
node_modules
3+
.quartz-cache

.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"printWidth": 100,
3+
"quoteProps": "as-needed",
4+
"trailingComma": "all",
5+
"tabWidth": 2,
6+
"semi": false
7+
}

content/.obsidian/workspace.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"type": "markdown",
1515
"state": {
1616
"file": "06-Git-Remote.md",
17-
"mode": "preview",
17+
"mode": "source",
1818
"source": true
1919
},
2020
"icon": "lucide-file",
@@ -170,13 +170,13 @@
170170
},
171171
"active": "d5a4af797a612641",
172172
"lastOpenFiles": [
173+
"index.md",
174+
"06-Git-Remote.md",
173175
"05-Stash.md",
174176
"04-Resolving Merge Conflicts.md",
175177
"03-Merge-Conflicts.md",
176178
"02-Merge.md",
177179
"01-Branching.md",
178-
"index.md",
179-
"06-Git-Remote.md",
180180
"attachments/Pasted image 20250322110505.png",
181181
"attachments/Pasted image 20250322084920.png",
182182
"attachments/Pasted image 20250322084846.png",

content/01-Branching.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
- - -
22
1. Use `git branch` to view your current branch
3-
```
3+
```bash
44
git branch
55
```
66
2. Rename the `master` branch to `main`
7-
```
7+
```bash
88
git branch -m oldname newname
99
```
1010
2. Create a new branch called "add_classics"
11-
```
11+
```bash
1212
git branch my_new_branch
1313
```
1414
4. Switch to the new branch
15-
```
15+
```bash
1616
git switch my_new_branch
1717
```
1818
5. Verify that you are in the new branch
19-
```
19+
```bash
2020
git branch
2121
```
2222
5. Add a new file called `classics.md` and put these contents

content/02-Merge.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
4. Merge the changes from the `add_classics` branch into the `main` branch. You will be presented with a code editor to change the commit message. Update the message to start with `E:`
1616
5. Save the file, and close the editor.
1717
6. From the `main` branch visualize the branches.
18-
```
18+
```bash
1919
git log --oneline --decorate --graph --parents
2020
```
2121
7. Delete the `add_classics` branch
22-
```
22+
```bash
2323
git branch -d add_classics
2424
```

content/03-Merge-Conflicts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- - -
22
1. Create a new branch called `update_classics` and switch to it.
3-
```
3+
```bash
44
git switch -c update_classics
55
```
66
2. While in `update_classics`, replace the last title with `Game of Thrones`, your new `classics.md` should be like this
@@ -23,7 +23,7 @@ The Wire
2323
```
2424
6. Stage the changes and commit with message starting with `G:
2525
7. Merge the `update_classics` into `main`
26-
```
26+
```bash
2727
git merge update_classics
2828
```
2929
8. Don't panic!

content/04-Resolving Merge Conflicts.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ I Love Lucy
2828
Game of Thrones
2929
```
3030
2. After resolving the conflict, stage the changes and *continue the merge*
31-
```
31+
```bash
3232
git add .
3333
git merge --continue
3434
```
3535
>[!Note] Make the commit message starting with "H: "
3636
3737
3. Delete the `update_classics` branch
38-
```
38+
```bash
3939
git branch -d upadte_classics
4040
```

0 commit comments

Comments
 (0)