Skip to content
Open
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
6b95fed
add deadline
github-classroom[bot] May 7, 2025
89b1d95
Add my personal page
LonglyTSunshine May 7, 2025
bb18e74
Merge pull request #1 from LonglyTSunshine/wanjiang-xie-page
LonglyTSunshine May 7, 2025
9749373
Introduce conflict in index.html
LonglyTSunshine May 7, 2025
f779941
Fix link to my page
LonglyTSunshine May 7, 2025
a3d89d2
Merge pull request #2 from LonglyTSunshine/main
LonglyTSunshine May 7, 2025
c69b4cc
Add unfinished function.txt
LonglyTSunshine May 7, 2025
05e3b66
Merge pull request #3 from LonglyTSunshine/rb-wanjiang
LonglyTSunshine May 7, 2025
74e25d6
Add new change from Wanjiang Xie
LonglyTSunshine May 7, 2025
c1e9b02
added my (sedar) page
Sedar18 May 7, 2025
01753d7
replaced anchor tag
Sedar18 May 7, 2025
897b474
Merge pull request #1 from LonglyTSunshine/rb-test-wanjiang
LonglyTSunshine May 7, 2025
61542e3
Merge pull request #5 from CSCI313-Spring2024/sedar-hebib-page-creation
Sedar18 May 7, 2025
2443bad
Made Very Important File
LonglyTSunshine May 7, 2025
bbe5420
Deleted Very Important File
LonglyTSunshine May 7, 2025
10df2cf
Made Very Important File
LonglyTSunshine May 7, 2025
1acd22c
Deleted Very Important File
LonglyTSunshine May 7, 2025
08775fe
Revert "Deleted Very Important File"
LonglyTSunshine May 7, 2025
3cf9f87
Merge pull request #6 from LonglyTSunshine/revert-wanjiang
LonglyTSunshine May 7, 2025
f3e1703
Fix link to my personal page
LonglyTSunshine May 7, 2025
1c63fc3
Add my personal HTML page
LonglyTSunshine May 8, 2025
e7ade62
Update my-page-wanjiang-xie.html
LonglyTSunshine May 8, 2025
0983a2a
Merge branch 'main' into revert-wanjiang
LonglyTSunshine May 8, 2025
5c3bf5d
Merge pull request #7 from LonglyTSunshine/revert-wanjiang
LonglyTSunshine May 8, 2025
d437331
Fix link to my page
LonglyTSunshine May 8, 2025
4414d6a
Merge branch 'main' into wanjiang-xie-page
LonglyTSunshine May 8, 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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/0uiMevno)
# git-group-tutorial

The purpose of this tutorial is to learn and apply git commands needed to collaborate on a team project.
Expand Down
2 changes: 2 additions & 0 deletions function.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This is a representation of an unfinished function a group member is working on.
This is a new change from Wanjiang Xie
1 change: 1 addition & 0 deletions important.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"Very important content"
17 changes: 9 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>GitHub Group Tutorial</title>
</head>
<body>
<a href="my-page.html">Your New Page</a>
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Wanjiang Xie's Page</title>
</head>
<body>
<h1>This is the page Wanjiang Xie added</h1>
<a href="my-page-wanjiang-xie.html">Wanjiang Xie's Page</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-sedar-hebib.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title>
</head>
<body>
<h1>This is the page Sedar added</h1>
<a href="index.html">Back</a>
</body>
</html>
13 changes: 13 additions & 0 deletions my-page-wanjiang-xie.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Wanjiang Xie’s Page</title>
</head>
<body>
<h1>This is the page Wanjiang Xie added</h1>
<a href="my-page-wanjiang-xie.html">My Page (Wanjiang Xie)</a>
</body>

</html>