Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
480f145
add deadline
github-classroom[bot] Apr 16, 2025
c43c2f7
my-page-ryan-wetzstein.html
ryanwetzstein Apr 16, 2025
841f11d
made conflict in index.html
ryanwetzstein Apr 16, 2025
655f887
Modified the index anchor tag
ryanwetzstein Apr 16, 2025
f4c8b88
Merge branch 'main' into ryan-wetzstein-page-creation
ryanwetzstein Apr 16, 2025
8dd8b14
Merge pull request #1 from CSCI313-Spring2024/ryan-wetzstein-page-cre…
ryanwetzstein Apr 16, 2025
ad2b628
made very important file
ryanwetzstein Apr 16, 2025
f5bf0c0
deleted very important file
ryanwetzstein Apr 16, 2025
6b5a873
Revert "deleted very important file"
ryanwetzstein Apr 16, 2025
5459916
Revert "made very important file"
ryanwetzstein Apr 16, 2025
dea4147
Merge pull request #2 from CSCI313-Spring2024/revert-ryan-wetzstein
ryanwetzstein Apr 17, 2025
042fd81
error fix
ryanwetzstein Apr 17, 2025
700bd2c
Merge branch 'main' of https://github.com/CSCI313-Spring2024/git-grou…
ryanwetzstein Apr 17, 2025
419c4b8
Modified the index anchor tag
Zach-Adolphsen Apr 17, 2025
64b46ed
Modified the index anchor tag
Zach-Adolphsen Apr 17, 2025
4df26dc
Modified the index anchor tag
Zach-Adolphsen Apr 17, 2025
2b216e5
Merge pull request #1 for Zach-Adolphsen-page-creation
Zach-Adolphsen Apr 17, 2025
52389bb
added function text file
Zach-Adolphsen Apr 17, 2025
ef2ccb0
Added "This is a change from..." in function.txt
Zach-Adolphsen Apr 17, 2025
7bee54d
Merge pull request #4 for rb-test-zach-adolphsen
Zach-Adolphsen Apr 17, 2025
7a228f8
add important.txt
Zach-Adolphsen Apr 17, 2025
45b00dc
Deleted Very Important File
Zach-Adolphsen Apr 17, 2025
fbb692a
reverted important.txt deletion
Zach-Adolphsen Apr 17, 2025
9555888
Merge pull request #5 from CSCI313-Spring2024/revert-zach-adolphsen
Zach-Adolphsen Apr 17, 2025
252c9f9
added my-page-ty-buechler.html
Apr 22, 2025
314e5da
added my-page-lance-lisondra.html
lancelisondra9 Apr 22, 2025
217a777
Modified the index anchor tag
lancelisondra9 Apr 22, 2025
f87f681
Commiting my page
Apr 22, 2025
ee05ca1
Test
Apr 22, 2025
e8c823a
Merge pull request #6 from CSCI313-Spring2024/ty-buechler-page-creation
TyBuechler Apr 22, 2025
fc080fe
Merge pull request #7 from CSCI313-Spring2024/main
lancelisondra9 Apr 22, 2025
fac60d9
Merge pull request #8 from CSCI313-Spring2024/lance-lisondra-page-cre…
lancelisondra9 Apr 22, 2025
98841aa
Modified function.txt
lancelisondra9 Apr 22, 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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![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 a change from Zach Adolphsen
This is a change from Lance Lisondra
Empty file added important.txt
Empty file.
5 changes: 4 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<title>GitHub Group Tutorial</title>
</head>
<body>
<a href="my-page.html">Your New Page</a>
<a href="my-page-ryan-wetzstein.html">Ryan's Page</a>
<a href="my-page-zach-adolphsen.html">Zach's Page'</a>
<a href="my-page-lance-lisondra.html">Zach's Page'</a>

</body>
</html>
12 changes: 12 additions & 0 deletions my-page-lance-lisondra.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 Lance Lisondra added</h1>
<a href="index.html">Back</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-ryan-wetzstein.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 Ryan Wetzstein added</h1>
<a href="index.html">Back</a>
</body>
</html>
13 changes: 13 additions & 0 deletions my-page-ty-buechler.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 Ty added</h1>
<h1>Test1</h1>
<a href="index.html">Back</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-zach-adolphsen.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 ZACH added</h1>
<a href="index.html">Back</a>
</body>
</html>