Drill 29: Write a test — Merging and conflicts
Write one test you would add for this example.
What you will be able to do
- Write one test you would add for this example.
Practice task
Write one test you would add for this example.
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
Write one test you would add for this example.
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.