Created
July 2, 2015 02:28
-
-
Save scresante/c6aa053d5c4464dc29cd to your computer and use it in GitHub Desktop.
git question
This file contains hidden or 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
| $ git pull origin classify | |
| * branch classify -> FETCH_HEAD | |
| Updating 8e66760..1255dbf | |
| error: The following untracked working tree files would be overwritten by merge: | |
| words | |
| Please move or remove them before you can merge. | |
| Aborting | |
| $ rm words | |
| rm: remove regular file ‘words’? y | |
| $ git pull origin classify | |
| * branch classify -> FETCH_HEAD | |
| Updating 8e66760..1255dbf | |
| Fast-forward | |
| words | 71882 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| 1 file changed, 71882 insertions(+) | |
| create mode 100644 words |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment