From 75b8c70a21f8267321c218c20e65cb822593e2ab Mon Sep 17 00:00:00 2001 From: Mikel Larreategi Date: Mon, 11 Nov 2024 08:06:54 +0100 Subject: [PATCH] Update project/{{ cookiecutter.__folder_name }}/devops/README-GITLAB.md Co-authored-by: Steve Piercy --- .../{{ cookiecutter.__folder_name }}/devops/README-GITLAB.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/{{ cookiecutter.__folder_name }}/devops/README-GITLAB.md b/project/{{ cookiecutter.__folder_name }}/devops/README-GITLAB.md index b3da60d..8199d6a 100644 --- a/project/{{ cookiecutter.__folder_name }}/devops/README-GITLAB.md +++ b/project/{{ cookiecutter.__folder_name }}/devops/README-GITLAB.md @@ -90,7 +90,7 @@ Be aware that the key generated by this template will not be added to your git r Development should be done in a separate branch, such as `develop`. -When opening a merge requests from that branch to `main`, the checks and tests will be executed and docker images +When opening a merge request from your development branch to `main`, CI/CD runs the checks and tests, and, if they pass, then builds the Docker images. will be built. When merging the merge request, the project will be deployed.