From c9f3f971e26f502f26720881078060f95e151cfd Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Mon, 11 Sep 2017 11:00:48 +0900 Subject: [PATCH] Add further documentation files --- CONTRIBUTING.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bfad7272..ce1eb340 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,9 +21,11 @@ copy of the relevant Copyright Assignment Form. Code style ---------- -Code in repmgr is formatted to a consistent style using the following command: +Code in repmgr should be formatted to the same standards as the main PostgreSQL +project. For more details see: - astyle --style=ansi --indent=tab --suffix=none *.c *.h + https://www.postgresql.org/docs/current/static/source-format.html Contributors should reformat their code similarly before submitting code to -the project, in order to minimize merge conflicts with other work. \ No newline at end of file +the project, in order to minimize merge conflicts with other work. +>>>>>>> Add further documentation files