Project: mulestudio
Issue STUDIO-3259: Support SCM merge
Studio Mule projects should be more team collaboration friendly. Today the main issue is related to merging mflow file. http://corp.wiki.mulesource.com/display/STUDIO/Studio+project+refactor+-+SCM-mflow+related+tasks
Story points: 5