gistfile1.txt

merkin /forge38/clients/extra_credit/rails (master)
r38y $ git checkout -b test-branch
Switched to a new branch 'test-branch'

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ ls
Capfile		books		doc		log		script		test
Rakefile	config		exports		public		spec		tmp
app		db		lib		randy.tmproj	stories		vendor

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ mate README

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ git status
# On branch test-branch
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	README
nothing added to commit but untracked files present (use "git add" to track)

merkin /forge38/clients/extra_credit/rails (test-branch*)
r38y $ git add .

merkin /forge38/clients/extra_credit/rails (test-branch*)
r38y $ git commit -m "Added a readme"
[test-branch e3a721c] Added a readme
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 README

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ git push
Counting objects: 4, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 284 bytes, done.
Total 3 (delta 1), reused 0 (delta 0)
To [email protected]:r38y/kotter.git
 * [new branch]      HEAD -> test-branch

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ git branch
  master
* test-branch

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ git checkout master
Switched to branch 'master'

merkin /forge38/clients/extra_credit/rails (master)
r38y $ git branch -D test-branch
Deleted branch test-branch (was e3a721c).

merkin /forge38/clients/extra_credit/rails (master)
r38y $ git checkout -b origin/test-branch test-branch
fatal: git checkout: updating paths is incompatible with switching branches.
Did you intend to checkout 'test-branch' which can not be resolved as commit?

merkin /forge38/clients/extra_credit/rails (master)
r38y $ git checkout -b test-branch origin/test-branch
Branch test-branch set up to track remote branch test-branch from origin.
Switched to a new branch 'test-branch'

merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ cat README 
Put stuff in here
merkin /forge38/clients/extra_credit/rails (test-branch)
r38y $ git checkout master
Switched to branch 'master'

merkin /forge38/clients/extra_credit/rails (master)
r38y $ git merge test-branch
Updating 082018a..e3a721c
Fast forward
 README |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 README

merkin /forge38/clients/extra_credit/rails (master)
r38y $ git branch -d test-branch
Deleted branch test-branch (was e3a721c).

merkin /forge38/clients/extra_credit/rails (master)
r38y $