cinderweb

Untitled

Oct 23rd, 2013
73
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.60 KB | None | 0 0
  1. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git checkout news-titles
  2. error: Your local changes to the following files would be overwritten by checkout:
  3. world/map/news.d/09-winter2012.txt
  4. world/map/news.d/10-news-news.txt
  5. world/map/news.d/11-CR-Jan13.txt
  6. world/map/news.d/12-manaplus.txt
  7. world/map/news.d/13-lpc.txt
  8. world/map/news.d/14-bugfix-killthegmevent.txt
  9. world/map/news.d/15-servermove.txt
  10. world/map/news.d/16-servermoveagain.txt
  11. world/map/news.d/17-beanie-easter.txt
  12. world/map/news.d/18-bugfixes.txt
  13. world/map/news.d/19-rollbackup.txt
  14. world/map/news.d/20-double-exp-drop.txt
  15. world/map/news.d/21-tulimshar-caves.txt
  16. world/map/news.d/22-orum-extension.txt
  17. world/map/news.d/23-astral-extension.txt
  18. Please, commit your changes or stash them before you can switch branches.
  19. error: The following untracked working tree files would be overwritten by checkout:
  20. world/map/news.d/24-code-release.txt
  21. Please move or remove them before you can switch branches.
  22. Aborting
  23. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git checkout news-titles -f
  24. Switched to branch 'news-titles'
  25. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git add .
  26. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git commit
  27. # On branch news-titles
  28. nothing to commit, working directory clean
  29. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git branch list
  30. fatal: A branch named 'list' already exists.
  31. jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git status
  32. # On branch news-titles
  33. nothing to commit, working directory clean
Advertisement
Add Comment
Please, Sign In to add comment