Skip to content

Ex15 #35

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

Ex15 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a0aa09
Create xyz test
evaldrin31 Jun 13, 2026
8315a29
added conflict file in ex15
evaldrin31 Jun 13, 2026
8d64d85
updated conflict file in master
evaldrin31 Jun 13, 2026
fda8551
Resolved merge conflicts
evaldrin31 Jun 13, 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
2 changes: 2 additions & 0 deletions conflict.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This line is from ex15 branch
This line is from master branch
1 change: 1 addition & 0 deletions xyz test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mic testing