Sounds good enough. You could probably even embed it into a Makefile or a Gruntfile or whatever-file you're using if you already have one. And about the two-steps thing, you might want to get them to use a post-merge hook to automate it.
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.