Skip to content

Challenge 02 #167

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
nkhplus wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Challenge 02 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3224f75
adds example.md to demonstrate the git process
nkhplus Nov 26, 2025
aa0413f
Add example content to example02.md
nkhplus Nov 26, 2025
bbbdaeb
This challenge 01.md
nkhplus Nov 26, 2025
f536ac3
Add an extra line to show git tracks changes
nkhplus Nov 28, 2025
3885454
Add demo
nkhplus Nov 28, 2025
bf4b48c
Remove example02.md
nkhplus Nov 28, 2025
203d74a
rename example.md to NewName.md
nkhplus Nov 28, 2025
2c682da
rename Challenge01.md to NewChallenge
nkhplus Nov 28, 2025
f77b278
Move NewName.md to First_Folder
nkhplus Nov 28, 2025
49edb56
Adds Second_Folder
nkhplus Nov 28, 2025
6d3847a
Revert "rename Challenge01.md to NewChallenge"
nkhplus Nov 28, 2025
aa77318
Add NewName
nkhplus Nov 28, 2025
70af9bc
Add a file
nkhplus Nov 28, 2025
c2fad7a
Add extra line
nkhplus Nov 28, 2025
44232fa
Move Make and Revert.md to First_Folder
nkhplus Nov 28, 2025
aa84858
revert make and revert.md
nkhplus Nov 28, 2025
9e497aa
xx
nkhplus Dec 3, 2025
f2992c0
add gitStatusDemo.md
nkhplus Dec 3, 2025
c3398dc
Update gitStatusDemo.md with merge test line
nkhplus Dec 3, 2025
3024384
add a change to create a merge confict
nkhplus Dec 3, 2025
2e66065
add test merge issue
nkhplus Dec 3, 2025
149a872
challeng 02
nkhplus Dec 3, 2025
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
}
}
3 changes: 3 additions & 0 deletions Challenge01.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This challenge 01 which I will push this markdonw to the remote

And the line
5 changes: 5 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,5 @@
This is content

This is an extra line


3 changes: 3 additions & 0 deletions Make and revert.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Make file and revert it

Add another extra line
Empty file added Second_Folder/.gitkeep
View file
Open in desktop
Empty file.
2 changes: 2 additions & 0 deletions challenge_02.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
a joke
this is a branch
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 @@
This is a new line, this is a better change!