Skip to content
This repository has been archived by the owner on Sep 27, 2022. It is now read-only.

Test branch #48

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Test branch #48

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
359c0bf
My first commit
swathikoppal Jan 13, 2022
360ca3e
Added more text to newfile.txt
swathikoppal Jan 14, 2022
4068e50
added files recursively level1 and level2
swathikoppal Jan 14, 2022
a0d6c33
renaming level2file.txt to file2.txt
swathikoppal Jan 14, 2022
cfb54ed
Renaming file
swathikoppal Jan 14, 2022
a4300c6
moving file from level1 to level2
swathikoppal Jan 14, 2022
acb1cb6
moving file
swathikoppal Jan 14, 2022
8e8612b
Renaming file1.txt
swathikoppal Jan 14, 2022
a78ef40
renamed file1.txt t level1.txt
swathikoppal Jan 14, 2022
59e412a
deleted test.txt
swathikoppal Jan 14, 2022
d4e1f05
deleted newfile.txt
swathikoppal Jan 14, 2022
1b847b1
deleting level1
swathikoppal Jan 14, 2022
5f17e84
My first commit
swathikoppal Jan 14, 2022
d5dbc06
Modified gitignore and file.txt
swathikoppal Jan 14, 2022
32fb33f
Added newfile.txt
swathikoppal Jan 16, 2022
dea5734
modified added another line
swathikoppal Jan 16, 2022
051533a
Update repo with change in comparison section
swathikoppal Jan 16, 2022
2f42244
Changing file.txt
swathikoppal Jan 16, 2022
df2c69a
changed file.txt to file.html
swathikoppal Jan 16, 2022
12513cd
Adding copyright notice
swathikoppal Jan 16, 2022
7f1d38f
added copyright notice
swathikoppal Jan 16, 2022
8198a25
Merge branch 'add-copyright'
swathikoppal Jan 16, 2022
2977d2f
added some dummy text
swathikoppal Jan 16, 2022
7226001
added author name in file.txt
swathikoppal Jan 17, 2022
84043a2
Added instruction in newfile.txt
swathikoppal Jan 17, 2022
b8f9da2
Merging changes from simple-changes branch
swathikoppal Jan 17, 2022
f300a66
added somemore text in newfile.txt
swathikoppal Jan 18, 2022
46158ec
added another paragraph to file.html
swathikoppal Jan 18, 2022
40810c5
added anther line in file.html
swathikoppal Jan 18, 2022
ca2d925
Merging changes from simple-changes
swathikoppal Jan 18, 2022
1af5d07
Making changes in file.html
swathikoppal Jan 18, 2022
a27f746
Adding conflicting changes
swathikoppal Jan 18, 2022
b7553a1
Done resolving the merge conflict
swathikoppal Jan 18, 2022
6b68d7c
updating gitignore file to exclude orig file
swathikoppal Jan 18, 2022
2faf84b
added one in file.txt
swathikoppal Jan 20, 2022
1b6ce26
Modified newfile.txt
swathikoppal Jan 20, 2022
edc0d07
testing rebase
swathikoppal Jan 20, 2022
129898a
adding changes before rebase conflict
swathikoppal Jan 20, 2022
cdefe84
mb conflicting change
swathikoppal Jan 20, 2022
191af41
adding some trouble to file.html
swathikoppal Jan 20, 2022
38608a2
adding changes after rebase conflict
swathikoppal Jan 20, 2022
790959a
Update file.html
swathikoppal Jan 20, 2022
9137fb7
local:added new file simple.html
swathikoppal Jan 20, 2022
df7f01d
Quick fix in production to improve
swathikoppal Jan 20, 2022
b9545d5
done updating simple.html
swathikoppal Jan 20, 2022
89ec5bf
a qucik prodn changes after the stash
swathikoppal Jan 20, 2022
9ed60ec
update to simple.html after the stash pop
swathikoppal Jan 20, 2022
3a0ff96
commit the changes after the git stash branch
swathikoppal Jan 20, 2022
75f1f70
Changed simple.html for tagging example
swathikoppal Jan 21, 2022
59f55dd
Updating for tag 1.1
swathikoppal Jan 21, 2022
3ed7d55
Test commits to show the diff
swathikoppal Jan 21, 2022
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,8 @@ _ide_helper.php
#System Files
.DS_Store
Thumbs.db


#Testing
/file.txt
*.orig
22 changes: 22 additions & 0 deletions file.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!-- Copyright -->
<!-- Adding changes for rebase conflict -->
<!DOCTYPE html>
<head>
<title>File stash branch</title>
</head>
<body>
<p>
dchjsakdd sjkdfsakjda aksjaksd asd kasdkasd
</p>
<p>
Just added another paragraph
another line
</p>
<p>
Not a dummy text
</p>
<p>sdgvhasdfasdhasdjahds mnabsdjhasd</p>
<p>A quick change after the stash</p>
Copyright 2022
</body>
</html>
16 changes: 16 additions & 0 deletions file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!doctype>
<html>
<head>
<title>Test</title>
</head>
<body>
<p>Testing file</p>

Author:Swathi

Added line in newfile.txt

Adding another line for test

</body>
</html>
26 changes: 26 additions & 0 deletions newfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# New Files Created for Testing Purpose
This is just a testing file.
Added another line

Adding few more line to check diff tool and merge tool configured in git
p4Merge is the tool configured for diff and merge tool in git.

Testing the difftool

Copyright 2022

testigngcnskkdfsdfsdfsdfdsf
sdfsdfksndfdsk


Please fork this repository and then issue pull requests for review.

msdbshadbashd nSFJKsfjsFKS FSAD FNSDFK

jsdafbjsdfsdf


asdmfsdmfdsf
Adding author SV

Testing Rebasing in Git
16 changes: 16 additions & 0 deletions simple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Title for Tagging example</title>
</head>
<body>
<p>Added this paragraph</p>
<p>Adding another paragraph in simple.html file</p>
<p>agdfshf hdsfbsf hjsfsdfhbsdfsdfj sdfhsdjfsd fjhsadfjsdf hhdsajfsdf</p>
<p>vsdfsf hjasdbs dfhdsfa sdafjsadf sdfjsdafnsdf</p>
<p>Added another paragraph for tagging example</p>
</body>
</html>