Skip to content

Joke #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atur769 wants to merge 26 commits into
base: main
Choose a base branch
from
Open

Joke #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4e5248d
adds example.md to demonstrate the git process
atur769 Jan 28, 2026
9838274
Create Example02.md
atur769 Jan 28, 2026
3886608
Create Challenge01.md
atur769 Jan 28, 2026
6b1328b
Adding Challenge001.md was fun
atur769 Jan 28, 2026
31133e7
Merge branch 'main' of https://github.com/atur769/git-essential-train…
atur769 Jan 28, 2026
72a5f23
adding gitStatusDemo.md
atur769 Jan 29, 2026
6a7414b
Adds an extra line to show how git tracks changes
atur769 Jan 29, 2026
af17986
adds extra lines to demonstrate git diff
atur769 Jan 29, 2026
fc7c8ad
removes Example02.md
atur769 Jan 29, 2026
b8d7faa
Renames example.md to newName.md
atur769 Jan 29, 2026
060e48a
renames gitStatusDemo.md to newStatus.md
atur769 Jan 29, 2026
2d42685
Moved newName.md to First_Folder
atur769 Jan 29, 2026
b2986bb
Adds Second_Folder
atur769 Jan 29, 2026
6ed74b5
Revert "renames gitStatusDemo.md to newStatus.md"
atur769 Jan 29, 2026
d88e6ca
Add changes to demonstrate the VSCode GUI
atur769 Jan 29, 2026
4b218be
Created a importantFile.md and added a line to it
atur769 Jan 29, 2026
f94a008
Added a second line to importantFile
atur769 Jan 29, 2026
beb5356
Added importantFile to First_Folder
atur769 Jan 29, 2026
43ef4e2
Revert "Added importantFile to First_Folder"
atur769 Jan 29, 2026
fb4d6c9
Accidentally messed up reverting
atur769 Jan 29, 2026
3e36152
Revert "Accidentally messed up reverting"
atur769 Jan 29, 2026
d257853
Edit to .gitignore and .vscode
atur769 Jan 30, 2026
7fb462c
Add folder logs and files log1.log and log2.log
atur769 Jan 30, 2026
433129b
Added LinkedinLearning to gitStatusDemo.md
atur769 Jan 30, 2026
fbf6963
adds a change to create a merge conflict
atur769 Jan 30, 2026
7b65de7
Added a joke to gitStatusDemo.md
atur769 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
node_modules
.tmp
npm-debug.log

log02.log

Second_Folder/*.log
6 changes: 3 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"workbench.colorTheme": "Visual Studio Dark",
"workbench.fontAliasing": "antialiased",
"workbench.statusBar.visible": true,
// "files.exclude": {
// "**/.git": false
// }
"files.exclude": {
"**/.git": false
}
}
1 change: 1 addition & 0 deletions Challenge001.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Challenge woohoo!
1 change: 1 addition & 0 deletions Challenge01.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Challenge woohoo!
4 changes: 4 additions & 0 deletions First_Folder/newName.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This is content

This is an extra line

Empty file added Second_Folder/.gitkeep
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions gitStatusDemo.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I just farted hahaha!
2 changes: 2 additions & 0 deletions importantFile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This is a new line
This is the second line
Empty file added logs/log1.log
View file
Open in desktop
Empty file.
Empty file added logs/log2.log
View file
Open in desktop
Empty file.