Pull

What if you want the remote changes go directly into the local branches (instead of stopping at the tracking branch)? You can do a pull.

• A pull is no special than a fetch right followed by a merge.

• Since a merge is involved in a pull, conflicts might occur. Hence Git might halt and ask you to solve the conflicts before the merge can be completed.

• Some people prefer doing a fetch first, inspect the changes, do some more work, then merge.

Similarly, pulling regularly helps reduce the divergence between the local and remote. It's always eaasier to deal with multiple small conflicts than a single large one.