From 9274fff81342a3f2f267f252e81c1ee5036af3c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Melan=C3=A7on?= Date: Sun, 28 Aug 2022 23:48:16 -0400 Subject: [PATCH] Slightly update general develop instructions --- tools/git-setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/git-setup.md b/tools/git-setup.md index 1993cf8..5a63db7 100644 --- a/tools/git-setup.md +++ b/tools/git-setup.md @@ -38,7 +38,7 @@ Patterns which a user wants git to ignore in all situations (e.g., backup or tem ## Develop -Pick a ticket, create a branch referencing the ticket number, e.g. `git checkout -b project-123`. Commit your code in small chunks capturing logical steps and follow the [Drupal coding standards](https://drupal.org/coding-standards) and the [guidelines for commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). All configuration that accompanies your code, e.g. creating fields and content types, must be in the `config` directory or scripted in an update hook. Once your work is done request a review and eventually your code will get merged into the master branch. +Pick a ticket, create a branch referencing the ticket number, e.g. `git checkout -b project-123`. Commit your code in small chunks capturing logical steps and follow the [Drupal coding standards](https://drupal.org/coding-standards) and the [guidelines for commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). All configuration that accompanies your code, e.g. creating fields and content types, must be in the `config` directory or scripted in an update hook. Once your work is done request a review (merge request) for your code will get merged into the main branch. Note: you may need to add your ssh key in the virtual machine. To do so with DDEV: