Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
4b8ec54
add deadline
github-classroom[bot] Apr 16, 2025
baf44a0
added my-page-patrick-wirries.html
PatrickWirries Apr 16, 2025
178167a
adde my-page-davis-ginsburg.html
dlginsburg515 Apr 16, 2025
ccdb0bf
added my-page-davis-ginsburg.html
dlginsburg515 Apr 16, 2025
5c96dd3
made confict in index.html.
dlginsburg515 Apr 16, 2025
9a728e3
Modified the index anchor tag
dlginsburg515 Apr 16, 2025
8638dce
modified index.html anchor tag
PatrickWirries Apr 16, 2025
9431b1e
Merge branch 'main' into davis-ginsburg-page-creation
dlginsburg515 Apr 16, 2025
c5ffa65
Merge pull request #1 from PatrickWirries/davis-ginsburg-page-creation
dlginsburg515 Apr 16, 2025
24e98e1
Merge branch 'main' into patrickbranch
PatrickWirries Apr 16, 2025
3c582f0
Merge pull request #2 from PatrickWirries/patrickbranch
PatrickWirries Apr 16, 2025
86672e1
added function text file
dlginsburg515 Apr 16, 2025
7835eb3
added function text file
PatrickWirries Apr 16, 2025
714dbe4
changed function text
dlginsburg515 Apr 16, 2025
82669eb
Merge pull request #3 from PatrickWirries/rb-test-davis-ginsburg
dlginsburg515 Apr 16, 2025
f47f1b1
Modified function.txt
PatrickWirries Apr 16, 2025
7e2a42a
Merge branch 'main' into rb-test-patrick-wirries
PatrickWirries Apr 16, 2025
fd2d3cf
Merge pull request #4 from PatrickWirries/rb-test-patrick-wirries
PatrickWirries Apr 16, 2025
dbef303
updated rb-davis-ginsburg and merged conflicts
dlginsburg515 Apr 16, 2025
752c88b
Merge pull request #5 from PatrickWirries/rb-davis-ginsburg
dlginsburg515 Apr 16, 2025
e2056bf
Modified function.txt to merge rb-patrick and rebase
PatrickWirries Apr 16, 2025
145950b
Merge pull request #6 from PatrickWirries/rb-patrick-wirries
PatrickWirries Apr 16, 2025
b712b01
added super important file
dlginsburg515 Apr 16, 2025
a95e421
Made very important file
PatrickWirries Apr 16, 2025
78dc566
deleted super important file
dlginsburg515 Apr 16, 2025
b17c91f
Deleted very important file
PatrickWirries Apr 16, 2025
e61b8dc
Revert "deleted super important file"
dlginsburg515 Apr 16, 2025
6899236
Merge pull request #7 from PatrickWirries/revert-davis-ginsburg
dlginsburg515 Apr 16, 2025
0a7d2f9
Revert "Deleted very important file"
PatrickWirries Apr 16, 2025
0eed30a
Merge pull request #8 from PatrickWirries/revert-patrick-wirries
PatrickWirries Apr 16, 2025
7b87589
Fixed 2 link names
PatrickWirries Apr 16, 2025
935914f
Merge branch 'main' of https://github.com/PatrickWirries/Github_Tutor…
PatrickWirries Apr 16, 2025
7b4c319
added my-page-nicholas-hoedl.html
nHoedl Apr 18, 2025
25295e2
Modified the index anchor tag
nHoedl Apr 18, 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 the changes made to this branch while you were working on rb-test

"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 patrick wirries"

This is a representation of an unfinished function a group member is working on.
This is a new change from Davis Ginsburg

Empty file added important.txt
Empty file.
7 changes: 5 additions & 2 deletions 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-nicholas-hoedl.html">Nicholas' New Page'</a>


</body>
</html>
</html>
13 changes: 13 additions & 0 deletions my-page-davis-ginsburg.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 Davis added</h1>
<a href="index.html">Back</a>
</body>
</html>
g
15 changes: 15 additions & 0 deletions my-page-nicholas-hoedl.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 Nicholas Hoedl added</h1>
<a href="index.html">Back</a>
</body>

</html>
12 changes: 12 additions & 0 deletions my-page-patrick-wirries.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 Patrick added</h1>
<a href = "index.html">Back</a>
</body>
</html>