[aerogear-issues] [JBoss JIRA] (AEROGEAR-8580) Squashing is causing repeated conflicts with your own changes