merge/rebase doesn't work?

[bostrom]

Hookup doesn't seem to resolve conflicts in structure.sql by rollbacking/migrating when doing a rebase. Steps to reproduce:

• add config.active_record.schema_format = :sql to application.rb
• git co master
• rails g migration createUsers
• Add users table definition
• rake db:migrate
• git ci -am "Create users"
• git co -b new-feature
• rails g migration addNameToUsers
• Add name column to users
• rake db:migrate
• git ci -am "Add name"
• git co master # hookup works here
• rails g migration addAgeToUsers
• Add age definition to migration
• rake db:migrate
• git ci -am "Add age"

So far so good, now either:

• git merge new-feature

or

• git co new-feature (hookup works here)
• git rebase master (but not here)

doesn't seem to trigger Hookup in any way. A conflict in structure.sql is detected and the merge/rebase halts.

Am I missing something? Using git version 2.3.6, ruby 2.2.2 and rails 4.2.1.