current branch. If Alice has made her own changes in the meantime,
then she may need to manually fix any conflicts. (Note that the
"master" argument in the above command is actually unnecessary, as it
current branch. If Alice has made her own changes in the meantime,
then she may need to manually fix any conflicts. (Note that the
"master" argument in the above command is actually unnecessary, as it
from a remote branch, then merges them into the current branch.
You can perform the first operation alone using the "git fetch"
from a remote branch, then merges them into the current branch.
You can perform the first operation alone using the "git fetch"
-command. For example, Alice could create a temporary branch just to
-track Bob's changes, without merging them with her own, using:
+command without merging them with her own branch, using:
-------------------------------------
shows a list of all the changes that Bob made since he branched from
-------------------------------------
shows a list of all the changes that Bob made since he branched from
current branch. Note that git pull always merges into the current
branch, regardless of what else is given on the commandline.
current branch. Note that git pull always merges into the current
branch, regardless of what else is given on the commandline.