K1Lesson 10 of 49about 60 minutes
Resolving conflicts
What you learn in this lesson
- understand when Git reports a conflict and when it merges on its own
- read conflict markers and resolve a conflict without losing either of the two changes
- abort a merge and prevent conflicts
- get to know rebase and know when not to use it
This lesson belongs to course K1
You will see this lesson's text and video once you have bought the course. The goals above show what you learn here.
€149.00
incl. VAT, one-time payment
Access to all of the course's lessons with their exercises, solutions and videos on this site, for 24 months from the purchase. A self-study course: no tutoring, no exams or grading by us, and no certificate.
Sign in and buy