Update (Jan 2018) : Definitely use config_split module.

This post was inspired by a situation where I found myself today so this post could also be named as "solving configuration workflow problem in Drupal 8 manually which you should never do because your team have a fast, reliable and automated deployment process which never fails".

Tipi Koivisto
Tipi Koivisto CEO