Created
January 30, 2017 17:58
-
-
Save llliiu/b04b1e8f323168c2df06d73fd4100722 to your computer and use it in GitHub Desktop.
Pull Errors
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| lu@Lus-MacBook-Pro ~/D/2/2/MAT 201B> mat201b2017/ | |
| lu@Lus-MacBook-Pro ~/D/2/2/M/mat201b2017> git stash | |
| No local changes to save | |
| lu@Lus-MacBook-Pro ~/D/2/2/M/mat201b2017> git pull | |
| Updating 34d3a97..45ca14a | |
| error: The following untracked working tree files would be overwritten by merge: | |
| .atom-build.yml | |
| .lvimrc | |
| init_lfs | |
| mat201b2017.sublime-project | |
| Please move or remove them before you merge. | |
| Aborting |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment