GNU/Linux Desktop Survival Guide
by Graham Williams
Update Master from Dev
When we are ready to merge the work we have completed in the dev branch back into the master then we will typically do the following:
$ git checkout master $ git merge dev $ git mergetool
The mergetool command allows us to resolve any conflicts.