gistfile1.txt

$ git reset --hard 7326feb5f7925991754ec2594ccf28c6c83613ec
HEAD is now at 7326feb Merge pull request #8 from mbklein/master

$ git status
# On branch master
# Your branch is behind 'origin/master' by 8 commits, and can be fast-forwarded.
#
nothing to commit (working directory clean)


$ git checkout new-solr-schema
Switched to branch 'new-solr-schema'


$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: new schemas to expose dynamic field properties (inspired by SunSpot)
Using index info to reconstruct a base tree...
<stdin>:59: trailing whitespace.
  <!-- 
<stdin>:64: trailing whitespace.
  
<stdin>:68: trailing whitespace.
    
<stdin>:85: trailing whitespace.
    
<stdin>:94: trailing whitespace.
    
warning: squelched 63 whitespace errors
warning: 68 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging solr/development-core/conf/schema.xml
CONFLICT (content): Merge conflict in solr/development-core/conf/schema.xml
Auto-merging solr/test-core/conf/schema.xml
CONFLICT (content): Merge conflict in solr/test-core/conf/schema.xml
Failed to merge in the changes.
Patch failed at 0001 new schemas to expose dynamic field properties (inspired by SunSpot)

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

*** EDIT solr/development-core/conf/schema.xml and solr/test-core/conf/schema.xml TO FIX MERGE ***

git add solr/development-core/conf/schema.xml solr/test-core/conf/schema.xml 

$ git rebase --continue
Applying: new schemas to expose dynamic field properties (inspired by SunSpot)
Applying: Add hydra 5.0 fields for backward compatibility
Applying: revised solrconfig to work with new solr schema
Applying: revisions to new solr schema
Applying: Added hardcoded fields to the new schema
Applying: Store permission fields
Applying: Permissions fields should not be stemmed
Applying: Remove unnecessary war files to speed startup time. Fixes #5

$ git status
# On branch new-solr-schema
# Your branch and 'origin/new-solr-schema' have diverged,
# and have 13 and 10 different commit(s) each, respectively.
#
nothing to commit (working directory clean)

$ git push origin +new-solr-schema
Counting objects: 60, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (43/43), done.
Writing objects: 100% (53/53), 8.90 KiB, done.
Total 53 (delta 28), reused 0 (delta 0)
To [email protected]:projecthydra/hydra-jetty.git
 + 21fe929...60d7a4b new-solr-schema -> new-solr-schema (forced update)

$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 8 commits, and can be fast-forwarded.

$ git merge new-solr-schema
Updating 7326feb..60d7a4b
Fast-forward
 solr/development-core/conf/schema.xml     |  988 ++++++++++++-----------------
 solr/development-core/conf/solrconfig.xml |  251 ++------
 solr/test-core/conf/schema.xml            |  987 ++++++++++++-----------------
 solr/test-core/conf/solrconfig.xml        |  251 ++------
 webapps/fedora-demo.war                   |  Bin 3110130 -> 0 bytes
 webapps/fop.war                           |  Bin 10432880 -> 0 bytes
 webapps/imagemanip.war                    |  Bin 3613339 -> 0 bytes
 webapps/saxon.war                         |  Bin 2759312 -> 0 bytes
 8 files changed, 905 insertions(+), 1572 deletions(-)
 delete mode 100644 webapps/fedora-demo.war
 delete mode 100644 webapps/fop.war
 delete mode 100644 webapps/imagemanip.war
 delete mode 100644 webapps/saxon.war

$ git push origin +master
Total 0 (delta 0), reused 0 (delta 0)