git rebase output

gistfile1.txt

git clone [email protected]:paulczar/chef-cookbooks.git
cd chef-cookbooks
git checkout folsom
git pull [email protected]:rcbops/chef-cookbooks.git folsom
git checkout vagrant
git rebase folsom
git push

here it complained that I was behind ... so ran a pull then the push.

git pull
git push


$ git clone [email protected]:paulczar/chef-cookbooks.git
$ cd chef-cookbooks
$ git checkout folsom
Branch folsom set up to track remote branch folsom from origin.
Switched to a new branch 'folsom'
$ git pull [email protected]:rcbops/chef-cookbooks.git folsom
From github.com:rcbops/chef-cookbooks
 * branch            folsom     -> FETCH_HEAD
Already up-to-date.
$ git checkout vagrant
Branch vagrant set up to track remote branch vagrant from origin.
Switched to a new branch 'vagrant'
$ git rebase folsom
First, rewinding head to replay your work on top of it...
Applying: adding keystone-setup role
Applying: keystone role now uses keystone-setup role
Applying: Unwinding merge 78a339509
Applying: vagrantfile and provisioning scripts
Applying: berkshelf/spiceweasel working
Applying: some work on chef-zero and more testing
Applying: tested two VM stack
Applying: cleaned up some doc
Applying: cleaned up some doc
Applying: cleaned up some doc
Applying: vagrantfile cleanup
Applying: Auto Updating hardware submodule
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule cookbooks/hardware (not checked out)
Auto-merging cookbooks/hardware
CONFLICT (submodule): Merge conflict in cookbooks/hardware
Failed to merge in the changes.
Patch failed at 0012 Auto Updating hardware submodule

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