On Mon, Nov 21, 2011 at 1:01 AM, Thomas Ferris Nicolaisen <tfn...@gmail.com>wrote:
> The normal approach is pretty much what the error message says: Either > commit first, or stash the changes. Example of the latter approach: > > $ git pull > <error msg> > $ git stash save > $ git pull > $ git stash pop > <handle conflicts> > > Beautiful -- Thanks! -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
