From c73dc46fd7f91c7eeb6411fe56e0f235da675512 Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Aug 06 2016 16:18:03 +0000 Subject: Fix bullet points in docs --- diff --git a/doc/usage/project_settings.rst b/doc/usage/project_settings.rst index 2350a0c..6cdc978 100644 --- a/doc/usage/project_settings.rst +++ b/doc/usage/project_settings.rst @@ -17,12 +17,14 @@ a pull-request. When merging a pull-request in pagure there are three states: * fast-forward: when the commits in the pull-request can be fast-forwarded -pagure signals it and just fast-forward the commit, keeping the history linear. + pagure signals it and just fast-forward the commit, keeping the history linear. + * merge: when the commits in the pull-request cannot be merged without a merge -commit, pagure signals it and performs this merge commit. + commit, pagure signals it and performs this merge commit. + * conflicts: when the commits in the pull-request cannot be merged at all -automatically due to one or more conflicts. Then pagure signals it and prevent -merging. + automatically due to one or more conflicts. Then pagure signals it and prevent + merging. If the `Activate always merge` option is on, then the `fast-forward` option above is disabled in favor of the `merge` option.