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

Closed
wants to merge 1 commit into
from

Projects

None yet

2 participants

@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.

@Bertg Bertg When merging into master the release branch is always preferred, so l…
…et the merge know and prevent conflicts.

Using the recursive/theirs strategy the release is always preferred.
faeb2ec
@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.

@Bertg Bertg closed this Oct 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment