Skip to content
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.

Sign up for GitHub

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

Just for learning #157

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

Just for learning #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ef04f6b
Add README2.md and enjoygit status!
IshitaTandon Dec 29, 2020
d09b662
Add abc.jpg to be committed.
IshitaTandon Dec 29, 2020
1841973
Update README2.md
IshitaTandon Dec 29, 2020
4050642
Update abc.jpg
IshitaTandon Dec 30, 2020
5304d80
Commit Done for Repo A
IshitaTandon Jan 3, 2021
9d7aba1
Commit Done for Repo B
IshitaTandon Jan 3, 2021
4e11c0d
SECOND TIME COMMIT
IshitaTandon Jan 3, 2021
9a3410c
Delete README2.md
IshitaTandon Apr 11, 2022
5de8994
Delete abc.jpg
IshitaTandon Apr 11, 2022
b7f0572
First Commit in development branch
IshitaTandon Apr 11, 2022
33bae6a
Second commit in Feature branch
IshitaTandon Apr 11, 2022
8f5db8a
Merge pull request #3 from AssignmentDevOps-1/development
IshitaTandon Apr 11, 2022
2d3f020
File added in development branch
IshitaTandon Apr 12, 2022
2edd31b
Merge pull request #4 from AssignmentDevOpsGit/master
IshitaTandon Apr 12, 2022
b0b7362
collab
IshitaTandon Apr 13, 2022
bc972fd
Edited by owner
tandonishi Apr 13, 2022
d83ef30
Resolved
tandonishi Apr 13, 2022
72a997f
Merge pull request #8 from AssignmentDevOps-5/master
IshitaTandon Apr 13, 2022
bc2e639
Delete newfile.txt.orig
tandonishi Apr 13, 2022
b732e6c
Delete newfile.txt
tandonishi Apr 13, 2022
210952a
Delete file3.txt
tandonishi Apr 13, 2022
aa9f7d5
First File Comitted in Development Branch
tandonishi Apr 13, 2022
07b709e
Merge pull request #9 from AssignmentDevOpsGit-1/development
IshitaTandon Apr 13, 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
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<<<<<<< HEAD
This ia a Demo Project list.
Merge-Conflict in Git
<<<<<<< HEAD
=======
This is a Demo Project list.
Merge-Conflict in Git
A New Edit in README.md
>>>>>>> 84a93dc... Commit Done for Repo B
=======
A New Edit in README.md
>>>>>>> 16d3bb4... SECOND TIME COMMIT
Mega Project List
========

Expand Down
1 change: 1 addition & 0 deletions file1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hello, this is the first file in development branch
1 change: 1 addition & 0 deletions file2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hello, this is file2 in feature branch
1 change: 1 addition & 0 deletions file3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This file3 added in development branch !