Advertisement
Guest User

giterror

a guest
Sep 16th, 2016
25
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.81 KB | None | 0 0
  1. ➜ myRepository git:(dev) ✗ git checkout dev
  2. M .meteor/versions
  3. Already on 'dev'
  4. Your branch and 'origin/dev' have diverged,
  5. and have 1 and 1 different commit each, respectively.
  6. (use "git pull" to merge the remote branch into yours)
  7.  
  8. ➜ myRepository git:(dev) ✗ git reset --hard HEAD
  9. HEAD is now at d7e3898 added some functions
  10.  
  11. ➜ myRepository git:(dev) git status
  12. On branch dev
  13. Your branch and 'origin/dev' have diverged,
  14. and have 1 and 1 different commit each, respectively.
  15. (use "git pull" to merge the remote branch into yours)
  16. Changes not staged for commit:
  17. (use "git add <file>..." to update what will be committed)
  18. (use "git checkout -- <file>..." to discard changes in working directory)
  19.  
  20. modified: .meteor/versions
  21.  
  22. no changes added to commit (use "git add" and/or "git commit -a")
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement