e where the merged-in branch is from a different repository,
this is done by first <a href="#def_fetch">fetching</a> the remote branch
and then merging the result into the current branch.  This
combination of fetch and merge operations is called a
<a href="#def_pull">pull</a>.  Merging is performed by an automatic process
that identifies changes made since the branches diverged, and
then applies all those changes together.  In cases where changes
conflict, manual intervention may be required to complete the