Go to TogaWare.com Home Page. GNU/Linux Desktop Survival Guide
by Graham Williams
Duck Duck Go

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.

Copyright © 1995-2020 Togaware Pty Ltd
Support further development through the
purchase of the PDF version of the book.
Brought to you by Togaware and the author of open source software including Rattle and wajig.
Also the author of Data Mining with Rattle and Essentials of Data Science.