On 8/22/14 8:57 PM, "Justin Mclean" <jus...@classsoftware.com> wrote:
>Hi, > >> Merge the whole thing. I don't think I remembered to merge the last few >> Installer releases anyway. > >If we merge the whole ting we get unreleased files/changes in master. I >thought the whole point was mast was only what had been released. I think for already released products, master should only get updated with a released copy. But it is a good question about whether the donations should have been dropped into master as the master copy of the ip-cleared donation, even if they weren't ready to go. So that's why I'm ok with you merging the whole thing. I think your only other option is to remove everything from flex-utilities that hasn't been released, do the merge with master, then restore everything. I'm ok with you doing that. I'm not doing a whole lot in that branch right now. Sounds risky though. -Alex
