diff options
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/repo | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index c5caec11e35..2ed51c5cfc7 100644 --- a/admin/notes/repo +++ b/admin/notes/repo | |||
| @@ -54,8 +54,8 @@ We do not intend to "git merge" from scratch branches, so force-pushes | |||
| 54 | are tolerated, as well as commits with poor style, incomplete commit | 54 | are tolerated, as well as commits with poor style, incomplete commit |
| 55 | messages, etc. | 55 | messages, etc. |
| 56 | 56 | ||
| 57 | We do expect to "git merge" from feature branches so: no force push, | 57 | We do expect to "git merge" from feature branches so no force pushes. |
| 58 | and no commits that don't have a proper commit message. | 58 | Also cf. "Long-lived feature branches" in admin/notes/git-workflow. |
| 59 | 59 | ||
| 60 | Automatic tests are run for feature/* branches on EMBA. | 60 | Automatic tests are run for feature/* branches on EMBA. |
| 61 | See: https://emba.gnu.org/emacs/emacs/-/pipelines | 61 | See: https://emba.gnu.org/emacs/emacs/-/pipelines |