Skip to content

Lab resolving git conflicts #53

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

Lab resolving git conflicts #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67ffab5
first test
ximbalou Feb 12, 2020
38a0b08
creating a conlict
ximbalou Feb 19, 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
6 changes: 1 addition & 5 deletions your-code/about-me.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
NEW BRANCH - MODIFIED TO PROVOKE A CONFLICT, FIXED AFTERWARDS ----

Carla is a passionate, honest, web developer musician and financier.

Learning the new tech world lingo and pursuing all passions while trying to watch all the top 250 movies she can find.
this will make a conflict