Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
7e69b78
add deadline
github-classroom[bot] Apr 11, 2025
ecf7dd6
added my-page-brett-blomquist.html
brettblomquist Apr 11, 2025
8b52a95
added my-page-elaina-haugen
Elaina-Haugen Apr 11, 2025
ec40984
made conflict in index.html
brettblomquist Apr 11, 2025
53218ca
Modified the index anchor tag
brettblomquist Apr 11, 2025
a578436
Modified the index anchor tag
brettblomquist Apr 11, 2025
649ce51
Merge branch 'main' into brett-blomquist-page-creation
brettblomquist Apr 11, 2025
bf1d1f4
Merge pull request #1 from CSCI313-Spring2024/brett-blomquist-page-cr…
brettblomquist Apr 11, 2025
58898a8
anchor tag
Elaina-Haugen Apr 11, 2025
52e7cac
linked my page to index.html
Apr 11, 2025
8214b9f
Merge branch 'main' into elaina-haugen-first-page
Elaina-Haugen Apr 11, 2025
46ef616
Merge pull request #2 from CSCI313-Spring2024/elaina-haugen-first-page
Elaina-Haugen Apr 11, 2025
f93d9d4
Modified the index anchor tag
Apr 11, 2025
e796ba0
linked to my page
Apr 11, 2025
96a0910
Update index.html
brettblomquist Apr 11, 2025
0a84ffb
Merge branch 'main' into shuang-wu-page-creation
shuang1219 Apr 11, 2025
32eafc9
add shuang-wu page and updated index.html
Apr 16, 2025
2d972e5
Merge branch 'main' into shuang-wu-page-creation
shuang1219 Apr 16, 2025
3356d38
Merge pull request #3 from CSCI313-Spring2024/shuang-wu-page-creation
shuang1219 Apr 16, 2025
5f731da
added function text file
brettblomquist Apr 16, 2025
ad3dbe8
Added new line to function
brettblomquist Apr 16, 2025
e6aac03
Merge pull request #4 from CSCI313-Spring2024/rb-test-brett-blomquist
brettblomquist Apr 16, 2025
09dc552
Revert "Rb test brett blomquist"
brettblomquist Apr 16, 2025
9e08e50
Merge pull request #5 from CSCI313-Spring2024/revert-4-rb-test-brett-…
brettblomquist Apr 16, 2025
57c2d1f
Revert "Revert "Rb test brett blomquist""
brettblomquist Apr 16, 2025
e7ff638
Merge pull request #6 from CSCI313-Spring2024/revert-5-revert-4-rb-te…
brettblomquist Apr 16, 2025
afa837b
Fix function.txt
brettblomquist Apr 16, 2025
ec11172
Update function.txt
brettblomquist Apr 16, 2025
b154fb8
Delete function.txt
brettblomquist Apr 16, 2025
8542575
added text function file
brettblomquist Apr 16, 2025
5decd8b
added function.txt
brettblomquist Apr 16, 2025
f08d5ab
Merge pull request #7 from CSCI313-Spring2024/rb-test-brett-blomquist
brettblomquist Apr 16, 2025
fa097e3
added new lines to function
brettblomquist Apr 16, 2025
39feab4
Merge pull request #8 from CSCI313-Spring2024/rb-brett-blomquist
brettblomquist Apr 16, 2025
53768c2
Made a very important file
brettblomquist Apr 16, 2025
778eae8
Deleted a very important file
brettblomquist Apr 16, 2025
59b024c
Revert "Deleted a very important file"
brettblomquist Apr 16, 2025
410862f
Deleted important.txt
brettblomquist Apr 16, 2025
2dc1117
Made very important file
brettblomquist Apr 16, 2025
a559689
Deleted very important file
brettblomquist Apr 16, 2025
fb3b98b
Revert "Deleted very important file"
brettblomquist Apr 16, 2025
cc44d7d
Merge pull request #9 from CSCI313-Spring2024/revert-brett-blomquist
brettblomquist Apr 16, 2025
abca11b
fixed page title's from part 1
brettblomquist Apr 16, 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
3 changes: 3 additions & 0 deletions function.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This is a representation of an unfinished function a group member is working on.
This is the changes made to this branch while you were working on rb-test
This is a new change from Brett Blomquist.
Empty file added important.txt
Empty file.
6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
<title>GitHub Group Tutorial</title>
</head>
<body>
<a href="my-page.html">Your New Page</a>

<a href="my-page-shuang-wu.html">Shuang's Page</a>
<a href="my-page-elaina-haugen.html">Elaina's Page</a>
<a href="my-page-brett-blomquist.html">Brett's Page</a>

</body>
</html>
12 changes: 12 additions & 0 deletions my-page-brett-blomquist.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 Brett added</h1>
<a href="index.html">Back</a>
</body>
</html>
15 changes: 15 additions & 0 deletions my-page-elaina-haugen.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!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 Elaina added</h1>
<a href="index.html">Back</a>
</body>

</html>
13 changes: 13 additions & 0 deletions my-page-shuang-wu.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>Document</title>
</head>
<body>
<h1>This is the page Shuang added</h1>
<a href="index.html">Back</a>
</body>
</html>