Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # Check out fresh repository
- [12:37:37] Ruby$ ~/bin/git clone git@github.com:<myrepository>.git test_repos
- Initialized empty Git repository in /Users/evan/Development/Ruby/test_repos/.git/
- remote: Counting objects: 14819, done.
- remote: Compressing objects: 100% (5457/5457), done.
- remote: Total 14819 (delta 8667), reused 14810 (delta 8663)
- Receiving objects: 100% (14819/14819), 10.49 MiB | 261 KiB/s, done.
- Resolving deltas: 100% (8667/8667), done.
- Checking out files: 100% (2194/2194), done.
- [12:38:28] Ruby$ cd test_repos
- #show that I'm on the master branch, and available branches
- [12:38:34] test_repos$ ~/bin/git branch
- * master
- [12:38:40] test_repos$ ~/bin/git branch -a
- * master
- origin/HEAD
- origin/adv_search
- origin/edge
- origin/master
- origin/new_ui
- # create a tracking branch for edge and switch to it
- [12:38:41] test_repos$ ~/bin/git branch --track edge origin/edge
- Branch edge set up to track remote branch refs/remotes/origin/edge.
- [12:39:00] test_repos$ ~/bin/git checkout edge
- Checking out files: 100% (2420/2420), done.
- Switched to branch "edge"
- # switch back to master without doing anything
- [12:39:17] test_repos$ ~/bin/git checkout master
- Checking out files: 100% (2420/2420), done.
- Switched to branch "master"
- # now try to switch back to edge... and it won't let me!
- # I have not made ANY changes to any files since cloning the repository.
- [12:39:31] test_repos$ ~/bin/git checkout edge
- error: Entry 'public/stylesheets/default.css' would be overwritten by merge. Cannot merge.
- # confirm that the status is clean!
- [12:39:34] test_repos$ ~/bin/git status
- # On branch master
- nothing to commit (working directory clean)
- [12:39:50] test_repos$ ~/bin/
Add Comment
Please, Sign In to add comment