Skip to content
Open

Test #2454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
020856b
Adding hipster file
Jun 7, 2025
2fb9659
Adding more Lorem ipsum text
Jun 7, 2025
999a518
Adding new file
Jun 7, 2025
9f7f50d
Adding more hipsum
Jun 7, 2025
74ed0eb
Adding nested files recursively
Jun 7, 2025
cb10375
renaming level 5 file
Jun 7, 2025
82b8647
Renamed level 2 file
Jun 7, 2025
79a3ca9
Moved file from level 2 to level 5
Jun 7, 2025
deda1c8
Moving level 2 file back to its origin
Jun 7, 2025
d3cb1db
Renaming level1 file
Jun 7, 2025
a55eb00
Deleted nested files
Jun 7, 2025
86d726c
Adding ,gitignore
Jun 7, 2025
792b8e3
Add any modified log file directory
Jun 7, 2025
d8cbacf
README.md
Jun 8, 2025
ca3a898
README.md
Jun 8, 2025
7b5a521
Added Deployment status
Jun 8, 2025
ec2771c
Added contents for per status
Jun 8, 2025
c40c959
README.md
Jun 8, 2025
128f1e1
Adding minor revision
Jun 8, 2025
704104f
Updating repo with changes from comparisons
Jun 8, 2025
46f5f53
Changing title of an HTML Simple file
Jun 8, 2025
b1f5596
Added copyright on HTML
Jun 8, 2025
ad0bc18
Added copyright notice to README.md
Jun 8, 2025
ac63343
Merge branch 'copyright'
Jun 8, 2025
d901177
Adding team member to humans.txt
Jun 8, 2025
42a490f
Adding instructions on how to contribute on README file
Jun 8, 2025
c31c07f
Merging changes from simple-changes branch
Jun 8, 2025
f25285b
Making changes to simple.html
Jun 8, 2025
a5277ff
Adding conflicting changes on prupose for Git example
Jun 8, 2025
0d9df1a
Done resolving merge conflicts
Jun 8, 2025
fab96b9
Updating ignore file to exclude merge temp files
Jun 8, 2025
64a8218
Adding one line to README for rebase example
Jun 8, 2025
665b207
Saying thanks to all of you'
Jun 8, 2025
d5bfe22
Adding another change
Jun 8, 2025
d7df471
mb before rebase conflicts
Jun 8, 2025
68f5692
mb conflicting chagnes brewing
Jun 8, 2025
452a2e3
fb adding come trouble to simple.html
Jun 8, 2025
ef68fa4
Adding conflict after rebasing conflict:
Jun 8, 2025
40b99b9
remote: minor change to line 48 index.html file
reiii792 Jun 8, 2025
ea69399
local: udpating simple.html copyright notice
Jun 8, 2025
7cf387b
Quick fix in production to improve README file
Jun 8, 2025
0b03a05
Done with simple.html updates
Jun 8, 2025
e7f826a
Quick fix after stash on Readme file
Jun 8, 2025
0f8027e
Updates to human file after stashed pop'
Jun 8, 2025
2724e22
Changes after git-stash-branch command
Jun 8, 2025
d802d4e
Tweaking file for tagging example
Jun 8, 2025
25ac69d
Updating for tag 1.2
Jun 8, 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 ,gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.DS_Store
log/
*.orig
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
# Starter Web Repo
A repository for a beginner's web page. more changes from myfeature branch. Updating for emergency purposes meow

This repository is for showing how Git and GitHub work
## Introduction
This repository is for showing how Git and GitHub work. Meow fore reabsing

## Deployment
This is to be deployed when I am done with this course, bleeh

## Purpose
None. Revision for something and comparison

Sample website with plenty of files for demos
## How To Contribute
Sample website with plenty of files for demos
Please fork me and this repo and then issue Pull request for review.
## Copyright
Copyright notice 2025. All rights reserved.
5 changes: 5 additions & 0 deletions hipster.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blah blah blah blha give me some text blah blah blah blah blahhhhhhhh asfhkjdshfjkdshfkjsdfhkjhfjksafhkjsdfhksjfhjksdfhjksd
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
5 changes: 5 additions & 0 deletions humans.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@

# TEAM


<name> -- <role> -- <twitter>
Jane Doe [email protected]

# THANKS

<name>
Thanks to all of you! rawrar

Comment, like, share, and subscribe if you like this module!

# TECHNOLOGY COLOPHON

Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title></title>
<title>Tagging Example</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

Expand Down Expand Up @@ -45,7 +45,7 @@
<div class="form-group">
<input type="password" placeholder="Password" class="form-control">
</div>
<button type="submit" class="btn btn-success">Sign in</button>
<button type="submit" class="btn btn-success">Log in</button>
</form>
</div><!--/.navbar-collapse -->
</div>
Expand Down
10 changes: 7 additions & 3 deletions simple.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<!DOCTYPE html>
<!-- This is a comment for miselfffff. copyright 2024

-->

<head>
<title></title>
<title>Update title for Tagging Comparison Website</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
Expand All @@ -14,11 +18,11 @@
<main class="container">
<!-- Content Goes Here -->
<p>
Just some content
Today is amazing and the weather is indeed unpridictable.
</p>
</main>
<footer class="container">
<p>&copy; Company 2014</p>
<p>&copy; Company of 55 2025</p>
</footer>
</body>
</html>
1 change: 1 addition & 0 deletions test-tracking-file.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Just testing tracking files haha