Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
b21c918
add deadline
github-classroom[bot] Apr 9, 2025
155a8c2
Added my-page-jewel-paulson
jewel-paulson Apr 9, 2025
a30a931
Made conflict in index.html
jewel-paulson Apr 11, 2025
cf636fe
Modified the index anchor tag
jewel-paulson Apr 11, 2025
0821f14
added my-page-kian-ansarinejad.html
KianFS Apr 16, 2025
a5d0193
Modified the index anchor tag
KianFS Apr 16, 2025
1ddb565
added my-page-first-last.html
YaBoiCarret Apr 16, 2025
27616d9
modified the index anchor tag
YaBoiCarret Apr 16, 2025
610d189
Merge branch 'main' into jewel-paulson-page-creation
jewel-paulson Apr 16, 2025
d16d7b7
Merge pull request #1 from CSCI313-Spring2024/jewel-paulson-page-crea…
jewel-paulson Apr 16, 2025
7984418
Update index.html to fix conflict
jewel-paulson Apr 16, 2025
08db8e7
added html with correct file name
YaBoiCarret Apr 16, 2025
0e479fa
Added function.txt file
jewel-paulson Apr 16, 2025
db91757
Actually fixed conflict now
jewel-paulson Apr 16, 2025
26a016e
removed incorrect file
YaBoiCarret Apr 16, 2025
9762941
changed href
YaBoiCarret Apr 16, 2025
055311b
Merge branch 'main' into Kian-Ansarinejad-creation
KianFS Apr 16, 2025
d3dff69
Merge pull request #3 from CSCI313-Spring2024/Kian-Ansarinejad-creation
KianFS Apr 16, 2025
50be8c8
Merge branch 'main' into garrets-branch
YaBoiCarret Apr 16, 2025
9b46cc6
Merge pull request #5 from CSCI313-Spring2024/garrets-branch
YaBoiCarret Apr 16, 2025
27b79b3
practiced rebase command
jewel-paulson Apr 16, 2025
a19e179
added function text file
YaBoiCarret Apr 16, 2025
6165f80
Merge branch 'main' into rb-test-jewel-paulson
jewel-paulson Apr 16, 2025
475075f
Merge pull request #6 from CSCI313-Spring2024/rb-test-jewel-paulson
jewel-paulson Apr 16, 2025
c3d7ae2
added line to txt file
YaBoiCarret Apr 16, 2025
8c6c176
Merge branch 'main' into rb-test-garret-doty
YaBoiCarret Apr 16, 2025
fc1d0ac
Merge pull request #7 from CSCI313-Spring2024/rb-test-garret-doty
YaBoiCarret Apr 16, 2025
2f5b607
added very important file
YaBoiCarret Apr 17, 2025
26df0eb
Merge pull request #8 from CSCI313-Spring2024/revert-garret-doty
YaBoiCarret Apr 17, 2025
fae6fc3
added function text file
KianFS Apr 17, 2025
74dfa72
kian added new line
KianFS Apr 17, 2025
360c4ea
Merge pull request #9 from CSCI313-Spring2024/rb-test-kian-ansarinejad
KianFS Apr 17, 2025
6e26b51
Add note about branch changes
KianFS Apr 17, 2025
564ec96
Merge pull request #10 from CSCI313-Spring2024/rb-kian-ansarinejad
KianFS Apr 17, 2025
089a688
Deleted Very Important File
KianFS Apr 17, 2025
c4f7f6e
Revert "Deleted Very Important File"
KianFS Apr 17, 2025
b84f2ab
Made
KianFS Apr 17, 2025
2b2ca97
Revert "Made"
KianFS Apr 17, 2025
d229f8a
very important file with a sentence
KianFS Apr 17, 2025
e9a4356
Deleted Very Important
KianFS Apr 17, 2025
d588e4a
Merge pull request #11 from CSCI313-Spring2024/revert-kian-ansarinejad
KianFS Apr 17, 2025
dc0998a
Made very important file
jewel-paulson Apr 18, 2025
f6732ca
Deleted very important file
jewel-paulson Apr 18, 2025
a82fe0f
Revert "Deleted very important file"
jewel-paulson Apr 18, 2025
31a69e5
Merge pull request #12 from CSCI313-Spring2024/revert-jewel-paulson
jewel-paulson 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
6 changes: 6 additions & 0 deletions function.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
This is a representation of an unfinished function a group member is working
on.
This is a new change from garret doty
This is a new change from Jewel Paulson.
This is a new change from kian ansarinejad .
This is the changes made to this branch while you were working on rb-test
Empty file added important.txt
Empty file.
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-garret-doty.html">First’s Page</a>
<a href="my-page-kian-ansarinejad.html">Kian's Page</a>
<a href="my-page-jewel-paulson.html">Your New Page</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-garret-doty.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 garret doty added</h1>
<a href="index.html">Back</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-jewel-paulson.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 Jewel Paulson added</h1>
<a href="index.html">Back</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-kian-ansarinejad.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 Kian Ansarinejad added</h1>
<a href="index.html">Back</a>
</body>
</html>