The branch now also contains the latest additions to the online docs as of... this mail ;)
Please update the doc to point people at the branch and stop editing https://docs.google.com/a/canonical.com/document/d/1Vv6r7h5PQyXkq3oLpUhrlaaf2InjC97f-wmVSUyDAxA/edit# Thanks, Vincent >>>>> Vincent Ladeuil <[email protected]> writes: > Hi all, > As discussed during the last hangout, lp:ubuntu-ci-services-itself is > now available. > Just to summarize the policy here, this branch has append_revisions_only > set to True so you're welcome to push there at your hearth content. > TD;LR: If you try to push something that will *remove* part of the > already shared history, you'll be warned and asked to merge locally. > In practice, it means that as long as your own branch history contain all the revisions > already shared in the trunk, just 'bzr push'. > If you have more than a couple of commits, it's good practice to merge > locally in a local mirror of trunk so your push appears as a single > revision on trunk[1]. > 1) If you feel your change is better in the trunk than in your local > branch, push ! > If others disagree, we have a conflict we can discuss see 2. > 2) If you feel the need to discuss some particular point, merge > proposals are fine. > 3) If we you can't push because someone did it since you branch from > trunk, merge locally. If you encounter conflicts, discuss with the > conflicting committer, resolve and push. Otherwise, see 1 or 2. > As for what goes in, if you have some fancy stuff you want to share, > create a new directory with your fancy stuff and push. > If at one point we feel that some directory activity deserve its own > project, we'll spin it off. > Summary: commit early, commit often and push. > Have fun, > Vincent > [1]: If you read the previous sentence and thought "OMG what jargon !", > don't worry, just push ;) > -- > Mailing list: https://launchpad.net/~canonical-ci-engineering > Post to : [email protected] > Unsubscribe : https://launchpad.net/~canonical-ci-engineering > More help : https://help.launchpad.net/ListHelp -- Mailing list: https://launchpad.net/~canonical-ci-engineering Post to : [email protected] Unsubscribe : https://launchpad.net/~canonical-ci-engineering More help : https://help.launchpad.net/ListHelp
