Git & GitHub·Practice drills 15

Drill 23: Explain each line — Merging and conflicts

Explain what each line of the example does.

Beginner 5 min read Lesson 378 of 480 Challenge included
What you will be able to do
  • Explain what each line of the example does.

Practice task

Explain what each line of the example does.

merge.shTerminal
git switch main
git pull
git merge feature/pricing
# resolve the marked files
git add pricing.md
git commit
git merge --abort
Your turn

Write your answer

Easy

Explain what each line of the example does.

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 in
Finished reading?

Lock in what you just learned.

Mark this lesson complete to save your place and move one step closer to the certificate.

Lesson 378 of 480 · 0% of course