mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Specify Github merge option for minor doc fixes (#3144)

pull/3147/head
Tom Dyson 2016-11-08 09:57:15 +00:00 zatwierdzone przez Matt Westcott
rodzic 24eee6e41e
commit d68c015658
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
docs/contributing/committing.rst
Wyświetl plik

@ -10,9 +10,9 @@ by at least one other reviewer or committer,
unless the change is a small documentation change or fixing a typo. unless the change is a small documentation change or fixing a typo.
Most code contributions will be in the form of pull requests from Github. Most code contributions will be in the form of pull requests from Github.
Pull requests should not be merged from Github though. Pull requests should not be merged from Github, apart from small documentation fixes,
Instead, the code should be checked out by a committer locally, which can be merged with the 'Squash and merge' option. Instead, the code should
the changes examined and rebased, be checked out by a committer locally, the changes examined and rebased,
the ``CHANGELOG.txt`` and release notes updated, the ``CHANGELOG.txt`` and release notes updated,
and finally the code should be pushed to the master branch. and finally the code should be pushed to the master branch.
This process is covered in more detail below. This process is covered in more detail below.