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

Jump to bottom

Rebase Conflict Branch #14

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

Rebase Conflict Branch #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9c56d6
conflicting commit
bestinbthomas Sep 4, 2020
0fc36f1
conflict tutorial
bestinbthomas Sep 4, 2020
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
21 changes: 21 additions & 0 deletions info .txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
this is line 1

this is line 2

this is modified line 3 dont this

this is line 4

this is modified 5 accept this

this is line 6

this is modified line 7 dont accept this

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed porttitor lacus eu mollis cursus. Suspendisse ex dolor, semper semper luctus eget, pretium sed lectus. Fusce tincidunt ligula at sapien pellentesque faucibus. Nunc bibendum quis turpis ut volutpat. Cras luctus, arcu vitae eleifend tempus, lacus libero eleifend quam, sit amet faucibus ipsum velit sed enim. Nam faucibus dapibus enim eu varius. Nunc tincidunt ut augue ac fringilla. Aliquam pharetra a arcu vitae porta.

Comment on lines +7 to +16
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete this

accept this

Duis rutrum efficitur elit, in ullamcorper libero condimentum ut. Morbi at lacus eleifend, suscipit dui et, volutpat orci. Morbi gravida enim pellentesque mauris consequat tristique. Vivamus nibh augue, venenatis id elit eget, lacinia aliquet arcu. Suspendisse potenti. Vivamus elit augue, tristique elementum ultricies id, pellentesque ac nibh. Ut mi nibh, accumsan sit amet finibus posuere, sodales in orci. Duis sodales, nisl rutrum venenatis vehicula, est massa bibendum dui, in hendrerit dolor purus eget tortor. Sed id augue ut justo dignissim dapibus vel a felis. Etiam posuere at felis ac lobortis. Nunc ac velit sapien. Ut a consequat diam. Duis et dui nisi.

Curabitur venenatis, erat ut laoreet faucibus, tellus magna accumsan ligula, sit amet luctus magna felis ac nisi. Ut ac felis quis velit ultricies hendrerit. Suspendisse bibendum hendrerit dui sit amet luctus. Nam tristique tempor tempor. Duis ac lobortis tortor. In condimentum volutpat consequat. Morbi elit tellus, iaculis ut viverra et, dictum et quam. Pellentesque congue eros at elit efficitur pellentesque. Pellentesque euismod, tellus et gravida tincidunt, metus nulla tincidunt tortor, id blandit urna turpis at lorem. Vestibulum elementum neque sed nunc dapibus, in fermentum risus egestas. Phasellus pellentesque pretium odio eget rutrum. Mauris velit sapien, sagittis in tempus eu, malesuada vitae libero. Duis vehicula ullamcorper auctor. Maecenas at libero facilisis, lobortis diam venenatis, tincidunt massa.