From fda06e267b95fba76e59fa9cdb2e1d105cfd08fd Mon Sep 17 00:00:00 2001 From: Wendelin Niesl Date: Fri, 24 May 2024 10:14:37 +0200 Subject: [PATCH 1/3] Fix typo in track-merge-* --- src/GitVersion.Configuration/Workflows/GitHubFlow/v1.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitVersion.Configuration/Workflows/GitHubFlow/v1.yml b/src/GitVersion.Configuration/Workflows/GitHubFlow/v1.yml index b6496b4d1d..4b3a4c9591 100644 --- a/src/GitVersion.Configuration/Workflows/GitHubFlow/v1.yml +++ b/src/GitVersion.Configuration/Workflows/GitHubFlow/v1.yml @@ -24,8 +24,8 @@ branches: increment: Patch prevent-increment: of-merged-branch: true - tracks-merge-target: false - tracks-merge-message: true + track-merge-target: false + track-merge-message: true regex: ^master$|^main$ source-branches: [] is-source-branch-for: [] From 371f8394a67e6b6fb25eccc95d5c1bbc63c4e85b Mon Sep 17 00:00:00 2001 From: Wendelin Niesl Date: Fri, 24 May 2024 10:17:18 +0200 Subject: [PATCH 2/3] Update configuration.md --- docs/input/docs/reference/configuration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/input/docs/reference/configuration.md b/docs/input/docs/reference/configuration.md index 25cdeb4bc9..2ff06ffe35 100644 --- a/docs/input/docs/reference/configuration.md +++ b/docs/input/docs/reference/configuration.md @@ -245,8 +245,8 @@ branches: increment: Patch prevent-increment: of-merged-branch: true - tracks-merge-target: false - tracks-merge-message: true + track-merge-target: false + track-merge-message: true regex: ^master$|^main$ source-branches: [] is-source-branch-for: [] From 57d134df7f6f57896de4ae9c0dbdeece4f597f31 Mon Sep 17 00:00:00 2001 From: Artur Stolear Date: Fri, 24 May 2024 10:40:29 +0200 Subject: [PATCH 3/3] run Generate Schemas --- schemas/6.0/GitVersion.configuration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/6.0/GitVersion.configuration.json b/schemas/6.0/GitVersion.configuration.json index 3f8e0f3290..2665b5d251 100644 --- a/schemas/6.0/GitVersion.configuration.json +++ b/schemas/6.0/GitVersion.configuration.json @@ -337,7 +337,7 @@ ] }, "nullableOfBoolean3": { - "description": "This branch related property controls the behvior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.", + "description": "This branch related property controls the behavior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.", "type": [ "boolean", "null"