Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
2e0d203
this is frist commit
dipakdesai294-ui May 30, 2026
ab42364
Merge pull request #1 from dipakdesai294-ui/INC-8605
dipakdesai294-ui May 30, 2026
54da882
this is first commit
dipakdesai294-ui May 31, 2026
d4e3c2d
this is my first commit
dipakdesai294-ui Jun 1, 2026
f4a5420
this is my new branch commit
dipakdesai294-ui Aug 7, 2026
a298ece
Merge pull request #3 from dipakdesai294-ui/NewBranch
dipakdesai294-ui Aug 7, 2026
6c192bd
i deleted 2 lines from script one
dipakdesai294-ui Aug 7, 2026
bab9f62
hello world
dipakdesai294-ui Aug 7, 2026
e943959
hello_2
dipakdesai294-ui Aug 7, 2026
d56434c
Merge pull request #4 from dipakdesai294-ui/Branch_2
dipakdesai294-ui Aug 7, 2026
f0e1ac8
hello world
dipakdesai294-ui Aug 7, 2026
a63775d
Merge pull request #5 from dipakdesai294-ui/Branch_1
dipakdesai294-ui Aug 7, 2026
67340d1
i created new file in repo
dipakdesai294-ui Aug 7, 2026
698094c
Merge pull request #6 from dipakdesai294-ui/Branch_2
dipakdesai294-ui Aug 7, 2026
055660c
this is my second try
dipakdesai294-ui Aug 7, 2026
5d855ff
Merge pull request #7 from dipakdesai294-ui/NewBranch_1
dipakdesai294-ui Aug 7, 2026
c969a0a
this is my second try
dipakdesai294-ui Aug 9, 2026
42eeb24
Merge pull request #8 from dipakdesai294-ui/Branch_1
dipakdesai294-ui Aug 9, 2026
2345f23
this is my fourth try
dipakdesai294-ui Aug 9, 2026
d4f26fa
this is my fourth try
dipakdesai294-ui Aug 9, 2026
a054365
Merge pull request #9 from dipakdesai294-ui/Branch_4
dipakdesai294-ui Aug 9, 2026
2f44fb2
this is my fifth try
dipakdesai294-ui Aug 9, 2026
9349224
Merge pull request #10 from dipakdesai294-ui/Branch_4
dipakdesai294-ui Aug 9, 2026
57b7c7c
this is my sixth try
dipakdesai294-ui Aug 9, 2026
018ebef
Merge pull request #11 from dipakdesai294-ui/Branch_5
dipakdesai294-ui Aug 9, 2026
7431536
this is my seventh try
dipakdesai294-ui Aug 10, 2026
0ec1563
Merge pull request #12 from dipakdesai294-ui/Branch_7
dipakdesai294-ui Aug 10, 2026
efb7078
this is my eight try
dipakdesai294-ui Aug 10, 2026
1f20f04
Merge pull request #13 from dipakdesai294-ui/Branch_8
dipakdesai294-ui Aug 10, 2026
a4080ac
this is dipak conflict file
dipakdesai294-ui Aug 10, 2026
2b227ea
this is akshay branch
dipakdesai294-ui Aug 10, 2026
be999b8
Merge pull request #14 from dipakdesai294-ui/Branch_Dipak
dipakdesai294-ui Aug 10, 2026
34a1ce8
Merge pull request #15 from dipakdesai294-ui/Branch_Akshay
dipakdesai294-ui Aug 10, 2026
3d9b130
Delete ConflictScript.sh
dipakdesai294-ui Aug 10, 2026
8e8b846
this is the conflict fie example
dipakdesai294-ui Aug 10, 2026
a5a952f
this is akshay
dipakdesai294-ui Aug 10, 2026
6dcb182
this is dipak
dipakdesai294-ui Aug 10, 2026
8b4e799
Merge pull request #17 from dipakdesai294-ui/Dipak_Branch
dipakdesai294-ui Aug 10, 2026
e9b3d40
Merge branch 'master' into Akshay_Branch
dipakdesai294-ui Aug 10, 2026
98588ca
Merge pull request #18 from dipakdesai294-ui/Akshay_Branch
dipakdesai294-ui Aug 10, 2026
fdd59af
this is new update
dipakdesai294-ui Aug 10, 2026
573b697
this is B1 commit
dipakdesai294-ui Aug 10, 2026
4ed2b81
this is B2
dipakdesai294-ui Aug 10, 2026
811494d
Merge pull request #19 from dipakdesai294-ui/Branch_1
dipakdesai294-ui Aug 10, 2026
3f5c901
Merge branch 'master' into Branch_2
dipakdesai294-ui Aug 10, 2026
d63119d
Merge pull request #20 from dipakdesai294-ui/Branch_2
dipakdesai294-ui Aug 10, 2026
fad71f2
this is my eighth try
dipakdesai294-ui Aug 12, 2026
6cdec01
Merge pull request #21 from dipakdesai294-ui/Branch_8
dipakdesai294-ui Aug 12, 2026
a8af065
this is my ninth try
dipakdesai294-ui Aug 15, 2026
a92f9b8
Merge pull request #22 from dipakdesai294-ui/Branch_9
dipakdesai294-ui Aug 15, 2026
e9e8a57
i removed conflict file
dipakdesai294-ui Aug 15, 2026
cf7debb
this is new conflict file
dipakdesai294-ui Aug 15, 2026
18ed64f
this is akshay
dipakdesai294-ui Aug 15, 2026
df70a4a
Merge pull request #23 from dipakdesai294-ui/akshay
dipakdesai294-ui Aug 15, 2026
a7f5724
edited file
dipakdesai294-ui Aug 15, 2026
5a8d9fa
deleted conflict file
dipakdesai294-ui Aug 15, 2026
57a28b1
this is newly created conflict file
dipakdesai294-ui Aug 15, 2026
1b4f7c6
this is akshay
dipakdesai294-ui Aug 15, 2026
bfbd01d
this is dipak
dipakdesai294-ui Aug 15, 2026
fadae96
Merge pull request #24 from dipakdesai294-ui/Akshay
dipakdesai294-ui Aug 15, 2026
797bd06
Merge branch 'master' into dipak
dipakdesai294-ui Aug 15, 2026
b0b003a
Merge pull request #25 from dipakdesai294-ui/dipak
dipakdesai294-ui Aug 15, 2026
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
10 changes: 10 additions & 0 deletions MyScript.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
echo "hello gitHub"
echo "this is my second try"
echo "this is my third try"
echo "this is my fourth try"
echo "this is myfourth try -1"
echo "this is my fifth try"
echo "this is my sixth try"
echo "this is my seventh try"
echo "this is my eighth try"
echo "this is my ninth try"
3 changes: 1 addition & 2 deletions Script1.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
echo "We are trying this practical from linux EC2"
echo "We are from batch-33 and learning git/gihub"
echo "We are learning Branching"
echo "I am learning Git"
echo "hello world"
5 changes: 5 additions & 0 deletions conflict_1
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
echo "We are trying this practical from linux EC2"
echo "We are from batch-33 and learning git/gihub"
echo "hello world"
echo "this is akshay"
echo "this is dipak"