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

Harry: Merge conflict test #6

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Harry: Merge conflict test #6

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64bb181
Harry: Merge conflict test
tczhu-sh May 11, 2021
15c1aa6
Harry: merge test 2
tczhu-sh May 11, 2021
cfb6d28
Third conflict
tczhu-sh May 11, 2021
146d3ce
Fourth conflict attempt
tczhu-sh May 11, 2021
b7d516d
Merge branch 'main' into feature-harry
Chris-Wang May 12, 2021
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
13 changes: 6 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
Vivien
# jrdevopsrepo
Garry
edit by vivien

edit by vivien-2

test pull request review rule
Harry adds this line to test the merge conflict
edit by vivien
Harry adds the second line to test the merge conflict
edit by Harry(fourth conflict attempt)
edit by vivien-3

edit by vivien and Conflict Test

Harry has joined the repo!
harry has joined the repo(third attempt for conflict)