GIT CSS Multiple branches, so many conflicts

GIT CSS Multiple branches, so many conflicts

So...
We are using this work flow called "git flow" so we create a different
feature for all the different bugs....
Which seems great for the PHP guys... however when I have like 5 different
features, and then I go to deploy these features for testing when I try to
merge them or rebase them I get like a million conflict errors.
Obviously this is because the SASS or CSS files are changing and are
different in each one. Just curious if anyone has any solutions to this?
Or run into this issue?
Like can I put the SASS and CSS in one folder, and when I create a new
branch can it pull all the latest SASS and CSS into it, and when I push
that it also updates the SASS and CSS in the main folder?
I dunno sounds kinda confusing, not sure if that would work.
The only other thing I can think of is maybe just using SASS, after I
finish a branch push that... go into the other branches pull the new SASS
files, delete the stylesheet, re compile the SASS into CSS and then push
that.
So then they always have the latest styles... However it just seems like a
bit annoying to have to keep going in to a different branch and recompile.
Or is there any different workflow to not cause this issue at all??
Thanks heaps!