diff options
author | Marcel Amirault <ravlen@gmail.com> | 2019-05-05 16:57:21 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-05 16:57:21 +0300 |
commit | 0207468401e41dcea537fa2d48f395a5fa7b3300 (patch) | |
tree | 5c7fb2dee472bb57bce8e64bd3105cdf0af75ea4 /doc/development/contributing | |
parent | 6f54ced40dadf268b6d1525c413f9ce52930f1fe (diff) |
Docs: Merge EE doc/development to CE
Diffstat (limited to 'doc/development/contributing')
-rw-r--r-- | doc/development/contributing/merge_request_workflow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/contributing/merge_request_workflow.md b/doc/development/contributing/merge_request_workflow.md index 5e310092a6e..8a4aa5dfa7f 100644 --- a/doc/development/contributing/merge_request_workflow.md +++ b/doc/development/contributing/merge_request_workflow.md @@ -155,7 +155,7 @@ the contribution acceptance criteria below: restarting the failing CI job, rebasing from master to bring in updates that may resolve the failure, or if it has not been fixed yet, ask a developer to help you fix the test. -1. The MR initially contains a a few logically organized commits. +1. The MR initially contains a few logically organized commits. 1. The changes can merge without problems. If not, you should rebase if you're the only one working on your feature branch, otherwise merge `master`. 1. Only one specific issue is fixed or one specific feature is implemented. Do not |