I work on a team with multiple developers and we use hook_update_N functions in a "miscellaneous" module to make updates such as module or theme enabling/disabling, performing miscellaneous database updates, one-off variable assignments, and more. We often encounter conflicts when having code reviews, since multiple feature branch pull requests get approved around the same time, many with hook_update_N implementations that use the same number (N). The process of resolving the conflicts is slow because each conflict has to be resolved in series.
One option would be to have each developer create their own "glue" module and put their hook_update_N implementations in that module's .install file, but it seems wasteful to run multiple modules as a workaround for this problem.
Anyone have a good solution to avoiding or minimizing the conflicts?