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> -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/sTEO80x-O_sJ. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
