Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9f6a230
adds Example.md for demonstration
falcn9 Jan 14, 2026
4606cab
Add example02.md with initial content
falcn9 Jan 14, 2026
a0b365f
adding gitStatusDemo.md to demonstrate git status
falcn9 Jan 21, 2026
c068e55
Merge branch 'main' of https://github.com/falcn9/git-essential-traini…
falcn9 Jan 21, 2026
23c7cfa
adds an extra line to show how git tracks changes
falcn9 Jan 21, 2026
4c32585
adds extra lines, demo of 'git diff' command
falcn9 Jan 21, 2026
8e9aba2
removes example02.md
falcn9 Jan 21, 2026
2125aed
renames Example.md to newname.md
falcn9 Jan 22, 2026
92a0864
renames gitStatusDemo.md to newStatus.md
falcn9 Jan 22, 2026
956071b
moves newname.md to First_Folder
falcn9 Jan 22, 2026
6b9a1c7
Adds Second_Folder
falcn9 Jan 22, 2026
be1906a
changed name to gitStatusDemo.md
falcn9 Jan 23, 2026
9aaddf4
adds changes to demonstrate the VSCode GUI
falcn9 Jan 23, 2026
4814ecb
add challengeFile.md
falcn9 Jan 24, 2026
b3850ed
adds a new line to challenge.File.md
falcn9 Jan 24, 2026
41e93a6
placed challengeFile.md in First_Folder
falcn9 Jan 24, 2026
d1d4df3
Revert "placed challengeFile.md in First_Folder"
falcn9 Jan 24, 2026
67ba174
creates a folder with 2 files for logs
falcn9 Jan 24, 2026
1167550
Merge pull request #1 from falcn9/logfolder
falcn9 Jan 24, 2026
f792673
Update content in gitStatusDemo.md
falcn9 Jan 24, 2026
46962bf
Add line to demonstrate merge conflict
falcn9 Jan 24, 2026
fe5ff4d
adds change to demo merge conflict again
falcn9 Jan 24, 2026
f18befc
adds a change to create a merge conflict
falcn9 Jan 24, 2026
1480d6f
Add line about confusion with training
falcn9 Jan 24, 2026
8c080ca
attempting once again 3rd time to demo a merge conflict
falcn9 Jan 24, 2026
2d3be2c
5th attempt
falcn9 Jan 24, 2026
5f213ec
added favorite joke for challenge exercise
falcn9 Jan 24, 2026
9a9fe54
adds another joke for challenge
falcn9 Jan 24, 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 First_Folder/newname.md
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
Empty file.
3 changes: 3 additions & 0 deletions challengeFile.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
here's a line

here's a new line in addition
10 changes: 10 additions & 0 deletions gitStatusDemo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
this is content, a new line...

new line

added a new line
add another line

how do i do this, nothing is working for me...

what did the chicken say to the egg?: you started it
1 change: 1 addition & 0 deletions joke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pull requests - because asking politely for your code to be rejected is still better than pushing straight to main.😄
Empty file added logs/logs01.log
Empty file.
Empty file added logs/logs02.log
Empty file.
2 changes: 2 additions & 0 deletions newStatus.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
this is content, a new line