Git and GitHubLesson 23Free preview

Pull from GitHub

This lesson is part of Git · All levels

Summary

Git pull takes the latest changes from the remote and incorporates them into the local branch that's currently active. Internally, pull consists of fetch (download reference) and then merge (combine). If the local change collides with the remote change on the same line, the conflict will arise and must be resolved.

Key points

Git pull = git fetch + git merge (or rebase when --rebase is used)
Git fetch downloads changes without directly incorporating
Git pull --rebase keeps the history linear
Conflict arises when the same line is changed on both sides

Full lesson

Code examples and quizzes

Full lessons, code examples, and quizzes are available to subscribers. 5 questions.