Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6d8692f
My first commit!
Lysell92 Nov 6, 2025
6d08449
Adding more ipsum text
Lysell92 Nov 6, 2025
b77798d
Adding new file
Lysell92 Nov 6, 2025
4febca3
more ipsum changes
Lysell92 Nov 6, 2025
2bfd821
Adding several files recursively
Lysell92 Nov 6, 2025
d85de03
Renaming the level3 file
Lysell92 Nov 7, 2025
0131414
Renaming the level2 file
Lysell92 Nov 7, 2025
7f70942
Moving file from level 2 to level 3
Lysell92 Nov 7, 2025
ed16d33
Moving level 3 file back to level 2 directory
Lysell92 Nov 7, 2025
b969422
Renaming level1 file
Lysell92 Nov 7, 2025
732575a
Deleting new file.
Lysell92 Nov 7, 2025
c27aeeb
Deleted hipster.txt file
Lysell92 Nov 7, 2025
d91ae69
Deleting level1 and all children
Lysell92 Nov 7, 2025
4caf79e
Created hipster.txt after previous deleting
Lysell92 Nov 7, 2025
84016c0
Adding gitignore file to exclude unwanted files
Lysell92 Nov 7, 2025
b56f6c9
Excluding log file directory
Lysell92 Nov 7, 2025
b262e6d
Deleted readme.md to make a new one
Lysell92 Nov 11, 2025
684ea49
Adding README file
Lysell92 Nov 11, 2025
fc455c1
Adding new section: Deployment
Lysell92 Nov 11, 2025
e07ba90
Adding description
Lysell92 Nov 11, 2025
56910e1
Adding introduction text
Lysell92 Nov 11, 2025
c420e38
Updating repo with changes from compare section
Lysell92 Nov 11, 2025
ed57070
Changing title of HTML file
Lysell92 Nov 11, 2025
7f9ea8c
Adding copyright notice
Lysell92 Nov 11, 2025
792ba7a
Adding copyright notice to readme
Lysell92 Nov 11, 2025
6321cec
Merge branch 'add-copyright'
Lysell92 Nov 11, 2025
8abeb56
Adding team member to humans.txt
Lysell92 Nov 11, 2025
d1fca24
Adding instructions on how to contribute
Lysell92 Nov 11, 2025
a39f3a3
Merging changes from simple-changes branch
Lysell92 Nov 11, 2025
3730547
Making changes to simple.html
Lysell92 Nov 11, 2025
632fa3a
Adding conflicting changes for git example.
Lysell92 Nov 11, 2025
4dfe4bb
Done resolving merge conflicts
Lysell92 Nov 11, 2025
d19fcc1
Updating ignore file to exclude merge temp files
Lysell92 Nov 11, 2025
964aed7
Adding oneliner to README for rebase example
Lysell92 Nov 11, 2025
3bc9c9e
Saying thanks to all my bros
Lysell92 Nov 11, 2025
acda15e
Adding another change after rebase
Lysell92 Nov 11, 2025
22ca3f9
mb before rebase conflicts
Lysell92 Nov 11, 2025
11e9aa0
mb conflicting changes brewing
Lysell92 Nov 11, 2025
039869d
Trying again to induce conflict when rebasing
Lysell92 Nov 11, 2025
b7d1006
Again an attempt to induce conflicts - here from featurestream
Lysell92 Nov 11, 2025
843fb83
Adding changes after rebasing conflict
Lysell92 Nov 11, 2025
73f4cb4
Remote: minor change to index.html
Lysell92 Nov 11, 2025
01df4ed
Local: updating simple.htmlc copyright notice
Lysell92 Nov 11, 2025
f20fd82
Quick fix in production to improve copyright notice
Lysell92 Nov 11, 2025
533ce58
Done with simple.html updates
Lysell92 Nov 11, 2025
d11b210
Quickfix after stash on readme file
Lysell92 Nov 11, 2025
3d339b7
Updates to humans file after stash pop
Lysell92 Nov 11, 2025
0c79542
Changes after git-stash branch command
Lysell92 Nov 12, 2025
c949b14
Tweaking file for tagging example
Lysell92 Nov 12, 2025
7f222b9
Updating for tag 1.2
Lysell92 Nov 12, 2025
9f7116d
Test commits to show diffs
Lysell92 Nov 12, 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
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
25 changes: 22 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
# Starter Web Repo
# Starter Web Project

This repository is for showing how Git and GitHub work
This is a simple web project for showing how to use Git and Github together.
Updating something.

## Introduction

This is an example that shows the different parts of the Git respository and various commands using a web project.

## Purpose

Sample website with plenty of files for demos
As stated above, the main purpose is to provide simple examples for Git training.

## Deployment

This is a simple web projects, deployment can be on any web server or even local file system.

## How to contribute

Please fork this respository and then issue Pull Requests for review.

### Copyright

2025 Git.Training. All rights reserved.

## Updates from Dev 1
3 changes: 3 additions & 0 deletions hipster.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Ugh drinking vinegar celiac truffaut swag, fixie chillwave letterpress food truck affogato slow-carb. Migas hexagon pop-up viral, cornhole keytar plaid. Cloud bread pop-up glossier air plant venmo fanny pack scenester letterpress. Skateboard pour-over bitters glossier selvage church-key JOMO taxidermy roof party air plant XOXO. Pork belly pabst chillwave wayfarers art party heirloom. Sustainable fixie gentrify pop-up tbh DSA forage synth yuccie ugh church-key neutra food truck. Selvage vaporware hammock distillery.

Air plant tbh organic palo santo cliche yuccie XOXO chambray copper mug hammock. Jawn chia vegan, cupping trust fund aesthetic skateboard fixie ennui gentrify meh grailed ramps fam. DSA pug poke coloring book banjo whatever biodiesel retro bespoke flannel lyft pickled. Whatever live-edge mukbang VHS hammock put a bird on it drinking vinegar, ugh street art banjo vinyl craft beer fam. Cold-pressed taxidermy williamsburg polaroid. Man bun organic quinoa, tumeric twee shaman locavore woke big mood street art cliche jawn. Keffiyeh vegan paleo synth pitchfork.
6 changes: 4 additions & 2 deletions humans.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@

# TEAM

<name> -- <role> -- <twitter>
Peter [email protected] twitter.petter

# THANKS

<name>
All my bros!
Please a review if you like this!

# TECHNOLOGY COLOPHON

HTML5, CSS3
jQuery, Modernizr
Git
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>Title for 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">Login</button>
</form>
</div><!--/.navbar-collapse -->
</div>
Expand Down
9 changes: 6 additions & 3 deletions simple.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<!DOCTYPE html>
<!--
Copyright 2025 Git.Training
-->
<head>
<title></title>
<title>Updating title for tagging compare example</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
Expand All @@ -14,11 +17,11 @@
<main class="container">
<!-- Content Goes Here -->
<p>
Just some content
Adding some text for stash example.
</p>
</main>
<footer class="container">
<p>&copy; Company 2014</p>
<p>&copy; Git serious copyright message 2025</p>
</footer>
</body>
</html>