Created
October 13, 2012 11:23
-
-
Save romualdbassinot/3884210 to your computer and use it in GitHub Desktop.
Problèmes liés à des changements locaux
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
| C:\Users\romu\Documents\projects\ohMyWishList\ohmywish>git pull origin master && | |
| rake db:migrate:reset | |
| remote: Counting objects: 173, done. | |
| remote: Compressing objects: 100% (120/120), done. | |
| remote: Total 128 (delta 59), reused 0 (delta 0) | |
| Receiving objects: 64% (82/128) | |
| Receiving objects: 100% (128/128), 61.38 KiB, done. | |
| Resolving deltas: 100% (59/59), completed with 20 local objects. | |
| From filmsdocumentaires.com:git | |
| * branch master -> FETCH_HEAD | |
| Updating ec2d782..29eff3c | |
| error: Your local changes to the following files would be overwritten by merge: | |
| Gemfile.lock | |
| app/models/user.rb | |
| config/initializers/devise.rb | |
| config/routes.rb | |
| Please, commit your changes or stash them before you can merge. | |
| Aborting |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment