This lesson is for subscribers
You've completed the free preview. Subscribe to unlock every lesson in every course.
Reading conflict markers, choosing between changes, and completing the merge with git add and commit.
You've completed the free preview. Subscribe to unlock every lesson in every course.