gistfile1.txt

Intergalactic:Valuation-Metrics andy$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 25 commits.
#   (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
Intergalactic:Valuation-Metrics andy$ git branch
  2243
* master
Intergalactic:Valuation-Metrics andy$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: Issue #2214
Using index info to reconstruct a base tree...
M  public/css/fund_details.css
M	public/css/global.css
M	public/js/fund_details.js
M	views/admin/layout.erb
<stdin>:314: trailing whitespace.
	border: solid 1px #80828A; 
<stdin>:400: trailing whitespace.
  color: #7B509F; 
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging views/admin/layout.erb
Auto-merging public/js/fund_details.js
Auto-merging public/css/global.css
CONFLICT (content): Merge conflict in public/css/global.css
Auto-merging public/css/fund_details.css
Failed to merge in the changes.
Patch failed at 0001 Issue #2214
The copy of the patch that failed is found in:
   /Users/andy/Sites/repository/Valuation-Metrics/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

Intergalactic:Valuation-Metrics andy$ git branch
* (no branch, rebasing master)
  2243
  master
Intergalactic:Valuation-Metrics andy$ git add .
Intergalactic:Valuation-Metrics andy$ git commit -m 'rebase upstream'
[detached HEAD 007462c] rebase upstream
 13 files changed, 85 insertions(+), 66 deletions(-)
Intergalactic:Valuation-Metrics andy$ git status
# HEAD detached from 3fb658b
# You are currently rebasing branch 'master' on '3fb658b'.
#   (all conflicts fixed: run "git rebase --continue")
#
nothing to commit, working directory clean
Intergalactic:Valuation-Metrics andy$ git branch
* (no branch, rebasing master)
  2243
  master
Intergalactic:Valuation-Metrics andy$ git rebase --continue
Applying: Issue #2214
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

Intergalactic:Valuation-Metrics andy$ git rebase upstream/master

It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase.  If that is the
case, please try
	git rebase (--continue | --abort | --skip)
If that is not the case, please
	rm -fr "/Users/andy/Sites/repository/Valuation-Metrics/.git/rebase-apply"
and run me again.  I am stopping in case you still have something
valuable there.
Intergalactic:Valuation-Metrics andy$ git rebase --continue
Applying: Issue #2214
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

Intergalactic:Valuation-Metrics andy$ git branch
* (no branch, rebasing master)
  2243
  master
Intergalactic:Valuation-Metrics andy$