aboutsummaryrefslogtreecommitdiff
path: root/dev/doc/MERGING.md
AgeCommit message (Collapse)Author
2019-05-21Fixing typos - Part 1JPR
2019-05-05New infrastructure for the unreleased changelog.Théo Zimmermann
Move existing entries.
2019-02-28Fix #9110: mention check-owners-pr.shThéo Zimmermann
2019-01-22Remove travisGaëtan Gilbert
The azure OSX job replaces the first travis job, and the second always fails and so is useless.
2018-11-22Document code owner team creation.Théo Zimmermann
2018-11-06Update/improve two aspects of the merging process.Théo Zimmermann
Following discussion in #7042, we write down an advice to give time for last comments before merging potentially controversial PRs. We document a practice that is becoming standard in order to improve PR merging time: some other maintainer can self-assign if the main maintainer is not responding. Encourage component maintainers to announce when they won't be available. We document the practice of code owner teams. Co-authored-by: Hugo Herbelin <Hugo.Herbelin@inria.fr>
2018-10-05Rename CHANGES to CHANGES.md.Guillaume Melquiond
2018-06-13Document how to restart failed CI jobs.Théo Zimmermann
[ci skip]
2018-06-13Markdown docs: switch from absolute to relative links.Théo Zimmermann
We had mostly used absolute links in the past. I just discovered that GitHub recommends using relative links instead: https://help.github.com/articles/basic-writing-and-formatting-syntax/#relative-links and indeed my Emacs Markdown mode can handle relative links but doesn't interpret absolute links relatively to the root of the git repository. [ci skip]
2018-05-24Complete rewrite of the documentation of overlays after Jim's additional ↵Théo Zimmermann
comments. [ci skip]
2018-05-24Improve merging and overlay documentations.Théo Zimmermann
Clarification prompted by Jim Fehrle. [ci skip]
2018-05-15Update MERGING.mdMatthieu Sozeau
Simpler
2018-05-15Update MERGING.mdMatthieu Sozeau
Actually there are more general instructions
2018-05-15git / gpg integration linkMatthieu Sozeau
2018-04-11merge script support https + typos in docPierre Courtieu
2018-04-05Add note for homebrew users.Théo Zimmermann
2018-04-05Some advice about merge script dependencies.Théo Zimmermann
Including: how to create a GPG key.
2018-04-05Improve the MERGING doc.Théo Zimmermann
In particular, describes what to do with overlays.
2018-03-23More precise wording about the merge process.Maxime Dénès
In particular, don't use the GitHub interface. Also, not all reviews are mandatory in some corner cases.
2018-03-21Refine a bit the decentralized merging process.Maxime Dénès
We make GitHub assign only principal maintainers as reviewers. This reduces the level of noise (PRs with 10 code owners), and makes it easy for the assignee to check if all reviews have been completed (all reviewers in the list have to approve the PR, which was not the case before if two reviewers were assigned for the same component). This change means that when a principal maintainer submits a patch touching the component they own, they should ask a review from the secondary maintainer.
2018-03-19Describe new merging process.Maxime Dénès