summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2022-01-18 10:48:30 +0200
committerGitHub <noreply@github.com>2022-01-18 10:48:30 +0200
commit0fd57f5600d02d3b5c43e3f4128a1de3ae4a0479 (patch)
treeec83b4d9920dfb6e4840c88e179e527047582672
parent40a19188d5cf8367dae63d993ffe863f493c6bd0 (diff)
parent85c6eccad9498d794600321055d1d7a04c75301a (diff)
Merge pull request #10358 from idryzhov/workflow-pr-cleanup
doc: cleanup submitting patches and enhancements
-rw-r--r--doc/developer/workflow.rst14
1 files changed, 2 insertions, 12 deletions
diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst
index e52ec056ad..54561d3b4b 100644
--- a/doc/developer/workflow.rst
+++ b/doc/developer/workflow.rst
@@ -249,23 +249,13 @@ changelog with some better description.
Submitting Patches and Enhancements
===================================
-FRR accepts patches from two sources:
-
-- GitHub pull request
-
-Contributors are highly encouraged to use GitHub's fork-and-PR workflow. It is
-easier for us to review it, test it, try it and discuss it on GitHub than it is
-via email, thus your patch will get more attention more quickly on GitHub.
+FRR accepts patches using GitHub pull requests.
The base branch for new contributions and non-critical bug fixes should be
``master``. Please ensure your pull request is based on this branch when you
submit it.
-GitHub Pull Requests
---------------------
-
-The preferred method of submitting changes is a GitHub pull request. Code
-submitted by pull request will be automatically tested by one or more CI
+Code submitted by pull request will be automatically tested by one or more CI
systems. Once the automated tests succeed, other developers will review your
code for quality and correctness. After any concerns are resolved, your code
will be merged into the branch it was submitted against.