sorry but `rebase` really sucks for things like that. especially if I have no clue about it ...  I am editing schema.db without knowledge about the bigger plan and that makes me really nervous. I just want to say it before I break something ... I am more a friend of resolving conflicts with `merge` and having a specially maintainer for it.

-- just saying