Guest User

Untitled

a guest
May 25th, 2018
212
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.69 KB | None | 0 0
  1. # Check out fresh repository
  2. [12:37:37] Ruby$ ~/bin/git clone git@github.com:<myrepository>.git test_repos
  3. Initialized empty Git repository in /Users/evan/Development/Ruby/test_repos/.git/
  4. remote: Counting objects: 14819, done.
  5. remote: Compressing objects: 100% (5457/5457), done.
  6. remote: Total 14819 (delta 8667), reused 14810 (delta 8663)
  7. Receiving objects: 100% (14819/14819), 10.49 MiB | 261 KiB/s, done.
  8. Resolving deltas: 100% (8667/8667), done.
  9. Checking out files: 100% (2194/2194), done.
  10.  
  11.  
  12. [12:38:28] Ruby$ cd test_repos
  13.  
  14. #show that I'm on the master branch, and available branches
  15. [12:38:34] test_repos$ ~/bin/git branch
  16. * master
  17. [12:38:40] test_repos$ ~/bin/git branch -a
  18. * master
  19. origin/HEAD
  20. origin/adv_search
  21. origin/edge
  22. origin/master
  23. origin/new_ui
  24.  
  25. # create a tracking branch for edge and switch to it
  26. [12:38:41] test_repos$ ~/bin/git branch --track edge origin/edge
  27. Branch edge set up to track remote branch refs/remotes/origin/edge.
  28. [12:39:00] test_repos$ ~/bin/git checkout edge
  29. Checking out files: 100% (2420/2420), done.
  30. Switched to branch "edge"
  31.  
  32.  
  33. # switch back to master without doing anything
  34. [12:39:17] test_repos$ ~/bin/git checkout master
  35. Checking out files: 100% (2420/2420), done.
  36. Switched to branch "master"
  37.  
  38.  
  39. # now try to switch back to edge... and it won't let me!
  40. # I have not made ANY changes to any files since cloning the repository.
  41. [12:39:31] test_repos$ ~/bin/git checkout edge
  42. error: Entry 'public/stylesheets/default.css' would be overwritten by merge. Cannot merge.
  43.  
  44.  
  45.  
  46. # confirm that the status is clean!
  47. [12:39:34] test_repos$ ~/bin/git status
  48. # On branch master
  49. nothing to commit (working directory clean)
  50. [12:39:50] test_repos$ ~/bin/
Add Comment
Please, Sign In to add comment