What I want in master-build is to show the squashed merge commits with any code changes from master since the last squashed merge commit to master-build.
I think there are conflicts when I try merging and the changed files don’t actually get committed to master-build. Any ideas?