Skip to content

Resolved merge conflict #7

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

Resolved merge conflict #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa67932
Only a small adjustment
martijnooo Jan 22, 2025
64ba8ca
This is the default file for testing conflicts
martijnooo Jan 24, 2025
5873fd3
First change to test file
martijnooo Jan 24, 2025
e42f3bf
This is a file with different changes to create conflicts
martijnooo Jan 24, 2025
05dfeef
This is the resolved file
martijnooo Jan 24, 2025
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: 1 addition & 1 deletion your-code/about-me.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Who am I
# Who am I -> This is just a small change

* I was born in Venezuela but moved to Algarve when I was 13.
* I have a PhD in Neuroscience but have no intention of staying in academia.
Expand Down
3 changes: 3 additions & 0 deletions your-code/about-me_v2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This is a test file for testing conflicts.

What happens when i make different changes on a different file?