GNU/Linux Desktop Survival Guide by Graham Williams
Desktop Survival Project Home Preface Advocacy History Distributions Installing GNU/Linux Basic Survival Wajig Applications AI, Machine Learning, Data Science Audio Backup Booting Cameras CD Chinese ChRoot Clock Cloud Computing Command Line Databases DIA Directories Disks Emacs Email Evolution Files File Systems Firewalls Floppy Disks FreedomBox Fonts Ghemical Glade GNOME Graphics, Images, Photos Hardware Initialisations on Booting Installation Examples IOT Java KDE Kernels Keyboard Konqueror KVM Switch LaTeX Log System Login Magellan MATE Mathematics Memory Modems Mounting Devices MS/Windows Music MySQL Nautilus Networks NFS NT File System Oracle Packages Partitions Passwords PDF Power Management PPP Presentations Printing Python R Remote Desktops Rsync Samba Scanning Science Screens Security Sketch Spell SPlus Spruce Spreadsheet SSH SUDO Swap Teradata Data Warehouse Themes TV Unity USB Version Control Video Virtualization Voice over IP World Wide Web WebCam WordPress Web Sites Word Processing and Printing X XML Troubleshooting Index

CLICK HERE TO VISIT THE UPDATED SURVIVAL GUIDE

Stash when pulling into a dirty tree

When you are in the middle of something and you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple git pull will let you move forward.

However, there are cases in which your local changes do conflict with the upstream changes, and git pull refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:

$ git pull 
... file foobar not up to date, cannot merge. 
$ git stash 
$ git pull 
$ git stash pop