1) We add changes to style-unminify.css then minify it and update style.css. 
  If there is a conflict on merge in style.css we update it from uniminified version. 
  If the conflict in both it's easy to solve it in style-unminify.css.
2) I usually use https://www.cleancss.com/css-minify/