Skip to content

10 learning how to better solve merge conflict #24

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

Merged
rsk6 merged 2 commits into from
Feb 18, 2023
Merged

10 learning how to better solve merge conflict #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f288bd0
Merge pull request #9 from kl63/8-having-a-deep-understanding-of-gith…
kl63 Feb 17, 2023
d1d0bcb
adding something I don't understand 2
Feb 17, 2023
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ Collaborating on GitHub:
### Things you don't understand about what we are doing / web development.
1. I wish I knew how to read different errors on command line.
2. The purpose of Github Actions.
3. Resolving merge conflicts.
### Things you want to know next
1. How to connect viewjs to elastic search