On 19/07/17 11:57 , Christian Beer wrote: > - if there is consensus that the feature is useful to BOINC in general > and known to be stable enough, the developer creates a pull request to > merge the feature into the master branch > - if the feature involves client changes, a new client version can be > built based on cherry-picking commits from master into the client > release branch
If the feature branch is autonomous (as it should be) then there's no need to cherry-pick single commits from master to the client release branch after merging the feature into master. Just merge the feature branch into the client release branch as well. This way you don't risk losing commit coherence. Other than that I'm fully in line with your proposal as it reflects what I've already proposed here: https://github.com/BOINC/boinc/issues/1874 Cheers, Oliver
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ boinc_dev mailing list [email protected] https://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
