Drill 15: Compare — Merging and conflicts
Compare this example with a related lesson or language.
What you will be able to do
- Compare this example with a related lesson or language.
Practice task
Compare this example with a related lesson or language.
git switch main
git pull
git merge feature/pricing
# resolve the marked files
git add pricing.md
git commit
git merge --abortYour turn
EasyWrite your answer
Compare this example with a related lesson or language.
TEXT · starter
Your answer…Study tools
Make it yours.
Keep a private note for this lesson, then turn the key ideas into flashcards you can revisit.
Sign in to save notes and flashcards.Both are private to your account and stay with your progress.
Sign inFinished reading?
Lock in what you just learned.
0%
Mark this lesson complete to save your place and move one step closer to the certificate.