Skip to content

Add three. #19

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
pkaminski wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add three. #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfb4455
Update lorem.txt
pkaminski Sep 12, 2025
a718310
Fix typo in comment in lorem.txt
pkaminski Apr 29, 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
6 changes: 5 additions & 1 deletion lorem.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ A different line in base.
// molestie hendrerit lorem vitae dapibus. In convallis maximus mauris, sit amet hendrerit lectus
// vulputate ac.

<<<<<<< HEAD
Another new line. Conflict time earlier!
Why isn't this a conflict?
=======
Another new line. Conflict time right now!
>>>>>>> 5a2f6e2 (Update lorem.txt)

// Aliquam mollis rhoncus diam, nec varius orci tristique in. In accumsan ac lacus sit amet tempor.
// Etiam iaculis nec libero ac lacinia. Donec finibus, nunc vitae dapibus iaculis, turpis tortor
Expand All @@ -30,7 +34,7 @@ Why isn't this a conflict?
// condimentum purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur
// ridiculus mus. Praesent vitae augue et sapien egestas ultrices. Vestibulum ac posuere lectus,
// vitae semper dui. Integer fermentum nec nulla eget aliquet. Fusce vitae tortor hendrerit, maximus
// ipsum id, fringilla mi.
// ipsum id, fringilla miiii.

Something something blah blah blah. And more blahssss.

Expand Down
Loading