Skip to content

test commit #1

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

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

test commit #1

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
55e6bd3
test commit
ab-hi-j Aug 13, 2019
767b989
new line at 07:08
ab-hi-j Aug 13, 2019
12c3609
Merge branch 'master' into next_branch
Ashish944 Aug 13, 2019
97280e5
test commit
ab-hi-j Aug 13, 2019
4bacaba
new line at 07:08
ab-hi-j Aug 13, 2019
fcf687d
Merge branch 'next_branch' of https://github.com/Ashish944/MergingPR …
ab-hi-j Aug 13, 2019
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
19 changes: 11 additions & 8 deletions day1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
This is new for online pulling request and merging demo for git training
<<<<<<< HEAD

iThis is new for online pulling request and merging demo for git training


Hello This is Ashish.
This is text from next branch
=======

Hello Siri.
>>>>>>> This text is added under master node
<<<<<<< HEAD
This line edited by Abhijit in Abhijit branch
=======

Line edited by Abhijit in master node
>>>>>>> Line edited by Abhijit in master node

test

new next_branch line