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

Avoid




$ git pull

This performs a fetch and merge. I used to often get stuck with the merge popping up an editor inside emacs. There are fixes for that but a fetch and then a rebase is a more comfortable work flow.

$ git merge origin/master

This merges any repository updates after a fetch into the local copy of master.


Copyright © 1995-2019 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.