http://qs321.pair.com?node_id=1080781


in reply to Versioned database schema git conflicts.

In my experience, it's very rarely a good idea to use dates &/or version identifiers in the names of version controlled files.

For myself, I'd use common file names for install & remove script pairs e.g. install_update.sql & remove_update.sql and then use the traditional method of continuous integration check-in whereby you rebase your repo to the current master (thus merging changes in the context of your repo) before pushing the result back up to the master. If absolutely necessary, the DB version can be recorded by means of the check-in comments - which using repo hooks, can/could be automated.

A user level that continues to overstate my experience :-))