When merging into master the release branch is always preferred, so let t

[Bertg]

When merging into master the release branch is always preferred, so let the merge know and prevent conflicts.
Using the recursive/theirs strategy the release is always preferred.

[gvangool]

Not necessarily, given following setup

    + B ---- C ---- D ---- E
   /   \     \
  /     \     +-- G ---+
 /       +-- F --+      \ 
/                 \      \
A ---------------+ H ---+ I

I should be able to contain fixes from H and G

[Bertg]

I'm not to sure about that. If F and G same lines in same files (e.g.: version bump) it can cause a collision. That's what has happened to us.

It's also nice just to be on the safe side.