Editing Git Cookbook (section)

==Syncing a repo with subsequent changes to the master==
Scenario: Create a branch, make edits. In the meantime other work is being done by other members of the team. The time comics to push your changes out. The goal is to merge their changes into yours locally then push it all out. 

* See what files have been touched: 
<syntaxhighlight lang="bash">
$ git status -s
</syntaxhighlight>

* View (unstaged) edits for a specific file:
<syntaxhighlight lang="bash">
$ git diff -- [path]
</syntaxhighlight>

* Switch from the local branch to 'master'.
<syntaxhighlight lang="bash">
$ git co master
</syntaxhighlight>

* Merge the updated local 'master' with the local branch, resolving any conflicts:
<syntaxhighlight lang="bash">
$ git branch
* master
  mybranch
$ git co mybranch
$ git merge master
</syntaxhighlight>

* See also <code>[http://git-scm.com/book/en/Git-Branching-Rebasing git rebase]</code><br />Which does the same thing as <code>git merge</code> but in a slightly different way that is helpful to maintain a linear set of changes when merging two branches together.