Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c8d1485
add deadline
github-classroom[bot] Apr 26, 2025
156ca24
added my-page-andrew-ambrosier.html
andrewambrosier Apr 26, 2025
925cd30
added my-page-colin-kuylen.html
colinkuylen Apr 26, 2025
a5ae6f0
Moodified the index anchor tag
andrewambrosier Apr 26, 2025
3e16f2e
Modified the index anchor tag
colinkuylen Apr 26, 2025
e9bf966
made conflict in index,html
andrewambrosier Apr 26, 2025
f2b3ebc
Merge branch 'main' into andrew-ambrosier-page-creation
andrewambrosier Apr 26, 2025
cdfe2e4
Merge pull request #1 from CSCI313-Spring2024/andrew-ambrosier-page-c…
andrewambrosier Apr 26, 2025
7eee3e5
added my-page-benjamin-norling.html
Fargauche Apr 26, 2025
ce7026e
Merge branch 'main' into colin-kuylen-page-creation
colinkuylen Apr 26, 2025
f4df72d
Merge pull request #2 from CSCI313-Spring2024/colin-kuylen-page-creation
colinkuylen Apr 26, 2025
200775e
Modified the index anchor tag
Fargauche Apr 26, 2025
6720a07
Merge branch 'main' into benjamin-norling-page-creation
Fargauche Apr 26, 2025
b203a4f
Merge pull request #3 from CSCI313-Spring2024/benjamin-norling-page-c…
andrewambrosier Apr 26, 2025
d19e290
added names to index
andrewambrosier Apr 26, 2025
610c5d5
Added function.txt
andrewambrosier Apr 26, 2025
1d6aec2
added function text file
colinkuylen Apr 26, 2025
39bbff0
Added change to function.txt
andrewambrosier Apr 26, 2025
704e579
Merge pull request #4 from CSCI313-Spring2024/rb-test-andrew-ambrosier
andrewambrosier Apr 26, 2025
e57cb08
“added function text file”
Fargauche Apr 26, 2025
a5f562d
added changes
colinkuylen Apr 26, 2025
9c5a1a1
added changes to function.txt
colinkuylen Apr 26, 2025
f1b2a52
Final staging part 2
Fargauche Apr 26, 2025
3f45c0e
Merge branch 'main' into rb-test-colin-kuylen
colinkuylen Apr 26, 2025
315295d
Merge pull request #5 from CSCI313-Spring2024/rb-test-colin-kuylen
colinkuylen Apr 26, 2025
d62e900
Final function changes
Fargauche Apr 26, 2025
664fa36
Merge branch 'main' into rb-test-benjamin-norling
Fargauche Apr 26, 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
11 changes: 11 additions & 0 deletions function.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
This is a representation of an unfinished function a group member is working
on.

This is a new change from Benjmain Norling

This is a representation of an unfinished function a group member is working on
This is a new change from Colin Kuylen

This is a representation of an unfinished function a group member is working
on.
This is a new change from Andrew Ambrosier
4 changes: 3 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<title>GitHub Group Tutorial</title>
</head>
<body>
<a href="my-page.html">Your New Page</a>
<a href="my-page-benjamin-norling.html">Benjamin’s Page</a>
<a href="my-page-colin-kuylen.html">Colin's Page</a>
<a href="my-page-andrew-ambrosier.html">Drew's Page</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-andrew-ambrosier.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 Andrew Ambrosier added</h1>
<a href="index.html">Back</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-benjamin-norling.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 Benjamin added</h1>
<a href="index.html">Back</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-colin-kuylen.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 Colin added</h1>
<a href="index.html">Back</a>
</body>
</html>