Skip to content

Test bracnh #2404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 49 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
db989d4
My first commit.
TRYazaki May 27, 2024
de9d21b
Adding more trining test
TRYazaki May 27, 2024
8aef2c6
Adding new file
TRYazaki May 27, 2024
3e5efb1
More added text
TRYazaki May 27, 2024
742f66d
Adding several files recurrsively.
TRYazaki May 27, 2024
0165616
Delted bak files.
TRYazaki May 27, 2024
63d94de
Renaming level3 file
TRYazaki May 27, 2024
a4cf72f
Renaming level2 file.
TRYazaki May 27, 2024
5737d1b
Moving file22_level.txt to level 3.
TRYazaki May 27, 2024
50ad56b
Moving file22_level-txt on level3 back to level 2 directory.
TRYazaki May 27, 2024
647449b
Deleting humans file
TRYazaki May 28, 2024
32ba2e8
Delted hipster.txt file.
TRYazaki May 28, 2024
c90fc7f
Deleted the level folder and all subdirectories
TRYazaki May 28, 2024
fd0b9c1
Adding .gitgnore file and some new file.
TRYazaki May 28, 2024
04b3a9e
Adding README file
TRYazaki May 28, 2024
1a8d5fe
Adding new section:Deployement
TRYazaki May 28, 2024
6109b2a
Adding some description
TRYazaki May 28, 2024
12fc4c6
Adding some description in Desciption section
TRYazaki May 28, 2024
a9b16b5
Updating repo with changes from comapre section.
TRYazaki May 31, 2024
9f5b8ed
Changing title of HTML file
TRYazaki May 31, 2024
f4a89e1
Deleting one file and ady copy right content to READMe
TRYazaki May 31, 2024
5378f0f
Merge branch 'add-coppyright'
TRYazaki May 31, 2024
b9c75fd
added shumans.txt files together with some text
TRYazaki May 31, 2024
ca2d246
Puting some new dummy text to humants.txt file
TRYazaki May 31, 2024
e5a47a4
puting some new text in README.md file
TRYazaki May 31, 2024
54b80b4
Merging changes from simple-changes branch
TRYazaki May 31, 2024
872876d
Making changes
TRYazaki May 31, 2024
7c7f91d
Making conflicting changes within the simple.html file.
TRYazaki May 31, 2024
7ea9089
Done resolving merge conflicts
TRYazaki May 31, 2024
4668778
Adding excluding of the .orig file to trcking of the git files
TRYazaki May 31, 2024
4cfd05e
Adding oneliner to README.md file for rebase example
TRYazaki May 31, 2024
2283456
Saying to thank to my student
TRYazaki May 31, 2024
b5c6374
Adding another change after rebase
TRYazaki May 31, 2024
ded9160
mb before rebase conflicts
TRYazaki May 31, 2024
960a174
fb adding some trouble to simple.html
TRYazaki May 31, 2024
f27c5e7
mb before reabse conflicts
TRYazaki May 31, 2024
050489a
mb conflicting changes brewing
TRYazaki May 31, 2024
2617bc5
fb adding some trouble to simple.html
TRYazaki May 31, 2024
d725fba
adding changes after rebasing conflict
TRYazaki May 31, 2024
abe6e56
remote: minior change to index.html file.
TRYazaki May 31, 2024
1185f1e
local: updating simple.html copyright notice
TRYazaki May 31, 2024
6428b49
Quick fix in production to improve copyright notice
TRYazaki Jun 6, 2024
e7188e8
Done with simple.html updates
TRYazaki Jun 6, 2024
8f20e86
Quick fix after stash on readme file.
TRYazaki Jun 6, 2024
4b7302f
Updates to himans file after stash pop
TRYazaki Jun 6, 2024
7e21fd0
Changes after git-stash branch command.
TRYazaki Jun 6, 2024
8920e5f
Tweaking file for taking examples.
TRYazaki Jun 11, 2024
d55dbf5
Updating for the tag 1.2
TRYazaki Jun 11, 2024
4756cf6
Update README.md Test commits to show diffs
TRYazaki Jun 11, 2024
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 .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.bak
*.orig
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@

This repository is for showing how Git and GitHub work

learning how to use git and gitlab together.
Making some changes or puting this text where while the changes made in other branch were not yet merged. updating for emergency fix after our stash.

## Introduction
A bit more of text here.

## How to Contribute
Just more and more dummytext.
Do some chnages
## Deployment
Ah soon it will be...
## Purpose

Sample website with plenty of files for demos
Sample website with plenty of files for demos

## Copyright
014 Git.training All rights reserved
1 change: 1 addition & 0 deletions dumy.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Tralalalaal.
30 changes: 15 additions & 15 deletions humans.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# humanstxt.org/
# The humans responsible & technology colophon

# TEAM

<name> -- <role> -- <twitter>

# THANKS

<name>

# TECHNOLOGY COLOPHON

HTML5, CSS3
jQuery, Modernizr
team information tralala
Adding some new text here additionaly. ijdlejdelj
djoedjeofe
de
fe
fef
efe
f
thank you to all my student. added on the branch.
Please leave a review if you like this course !
# TECHNOLOGY
new section tryout -!
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> Adding 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 in</button>
</form>
</div><!--/.navbar-collapse -->
</div>
Expand Down
1 change: 1 addition & 0 deletions newfile_tralala.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
wdöäedoedfoedkedope
50 changes: 26 additions & 24 deletions simple.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<!DOCTYPE html>
<head>
<title></title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
padding-top: 50px;
padding-bottom: 20px;
}
</style>
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
</head>
<body>
<main class="container">
<!-- Content Goes Here -->
<p>
Just some content
</p>
</main>
<footer class="container">
<p>&copy; Company 2014</p>
</footer>
</body>
</html>
<!DOCTYPE html>
Copyright notice!!!!

<head>
<title> Updating title for tagging example.</title>
<link rel="stylesheet" href="css/bootstrap.min.css">
<style>
body {
padding-top: 50px;
padding-bottom: 20px;
}
</style>
<link rel="stylesheet" href="css/bootstrap-theme.min.css">
</head>
<body>
<main class="container">
<!-- Content Goes Here -->
<p>
Adding more importnant content here.
</p>
</main>
<footer class="container">
<p>&copy; 2014 git. all rights reserved</p>
</footer>
</body>
</html>