[Hawkular-dev] Best Practices: MiQ Dependencies around other branches

[mike thompson]

Hey Hawkular Folk,

So I just wanted to know what is the ‘the way’  to incorporate branches or PRs that one’s  branch is dependent on? Since merging  into MiQ master takes so long, what is our strategy around dependent merges? We are unfortunately in the realm of long lived branches now. Much more rebasing and conflicts given the extended timeframes for merging.
I have asked around, and no one is confident in “the way”.

I have a couple methods in mind but not sure what the best practices are…. Please speak up if one works for you and we can adopt it.


— Mike