concretesolutions/codejudge — comment on commit 0f57015a423e9bf717b4c2ba52843401ec7d3a60
File:  line 0
By cassiomarques:

Try adding this to your ~/.gitconfig file

```
[merge "railsschema"]
name = newer Rails schema version
driver = "ruby -e '\n\
system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
b = File.read(%(%A))\n\
b.sub!(/^<+ .*\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n=+\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n>+ .*/) do\n\
%(ActiveRecord::Schema.define(:version => #{[$1, $2].max}) do)\n\
end\n\
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
exit 1 if b.include?(%(<)*%L)'"
```

Then re-add the schema.rb file to git and see if the merge problems go away. Ask all other devs involved in the project to do the same.
Also, everytime a merge problem happens with this file, don't change anything there by hand. Just run rake db:migrate and a new schema.rb file will be generated. Then you can commit the changes.