Gerrit’s submit strategy for "iotivity" has been changed from `Cherry Pick` to ‘Merge if Necessary’
This is after a several months long discussion where there was general agreement for the change, but it never actually happened. The change was made to help prevent build breaking changes where a commit is submitted before a commit that it depends on. What this means for developers: the "Merge if necessary" will perform a 3-way merge for commits that cannot be fast forwarded. If you have change A submitted to gerrit, then change B is submitted, and commit A is its parent, commit B cannot be submitted till A is committed. If commit B can be committed independent of commit A it will be the developers responsibility to resubmit commit B so its parent commit is not commit A. The other projects "iotivity-constrained", "iotivity-contrib" and "iotivity-node" were not changed yet (see earlier email on this topic). The change now being effectively reverted happened in Jan 2015 as noted this message: https://lists.iotivity.org/pipermail/iotivity-dev/2015-January/000091.html As in that change, if this ends up not working for people, we can flip it again. -- mats _______________________________________________ iotivity-dev mailing list iotivity-dev@lists.iotivity.org https://lists.iotivity.org/mailman/listinfo/iotivity-dev
