gistfile1.txt

$ git rebase master
First, rewinding head to replay your work on top of it...
Applying Turns some fields in event search to multi-select
.dotest/patch:122: trailing whitespace.
          where_clause += " AND #{table}.#{field.to_s.chop} IN (" + options[field].collect { |id| sanitize_sql_for_conditions(["%s", id])}.join(',') + ")" 
error: patch failed: webapp/app/helpers/application_helper.rb:204
error: webapp/app/helpers/application_helper.rb: patch does not apply
Using index info to reconstruct a base tree...
<stdin>:122: trailing whitespace.
          where_clause += " AND #{table}.#{field.to_s.chop} IN (" + options[field].collect { |id| sanitize_sql_for_conditions(["%s", id])}.join(',') + ")" 
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merged webapp/app/helpers/application_helper.rb