Merge master branch with origin/master branch:
$ git merge origin/master
Result Example:
$ git merge origin/master Updating 0ebd30c..a99dc51 Fast forward configure.ac | 1 + contrib/Makefile.am | 9 +- ...
As fetch and merge are common operation it can be replaced by only one command:
$ git pull
Resolving merge conflicts
Giving up and return to version before merging:
$ git reset --hard
Graphical tool:
$ git mergetool