Re: git lesson please

2017-12-13 Thread Achim Gratz via devel
Hal Murray via devel writes: > Is there a simple way to do a git pull when I have edits in progress? Yes, as Git tries to tell you already: > [murray@hgm raw]$ git pull > error: cannot pull with rebase: You have unstaged changes. > error: please commit or stash them. So you either commit your ch

Re: git lesson please

2017-12-13 Thread Richard Laager via devel
On 12/13/2017 12:25 AM, Hal Murray via devel wrote: > Is there a simple way to do a git pull when I have edits in progress? Use `git stash`, which (as you put it) is the "better way" to "save them off to the side". git stash git pull # Choose *one*: git stash apply git stash pop `git stash app