[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[p2-dev] Master v. Integration
Due to the long weekend I forgot to merge master into integration this week. This isn't very serious (since we are early in the development cycle), but it means we need to wait another week to test changes, etc... I'm wondering if we still need both branches for p2? Having two branches makes sense during active development, where things may get committed that shouldn't be included in a weekly integration build. However, for maintenance, it doesn't really make sense -- especially when you consider we typically just merge everything each week anyways.
What do you think about building p2 from master each week?