On Sat, Apr 11, 2015 at 11:15 PM, Matthew Jordan <mjor...@digium.com> wrote:
> > 1. We need to determine the best way to handle maintaining the long > running branches. While rebasing is appropriate for topic branches > (team branches) that closely track a mainline branch, the mainline > branches are a bit different. They not only don't have ever commit > merged into them (either going 'up' from 11 => 13 => master or 'down' > from master => 13 => 11), but patches are highly likely to merge > cleanly. ABI issues in 11/13 are a bigger concern than those in > master; APIs will have changed; etc. Ugh. This is what I get for writing this at 23:15. The gist of this paragraph is: I don't think 'git merge' will work well on mainline branches, regardless of the order in which we merge. I suspect we're going to want to cherry-pick. -- Matthew Jordan Digium, Inc. | Director of Technology 445 Jan Davis Drive NW - Huntsville, AL 35806 - USA Check us out at: http://digium.com & http://asterisk.org -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
