Skip to content

Commit 06e4e84

Browse files
committed
Add mainline into gitversion init. Fixes #991
1 parent 981bf8e commit 06e4e84

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/GitVersionCore/Configuration/Init/SetConfig/GlobalModeSetting.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ protected override StepResult HandleResult(string result, Queue<ConfigInitWizard
2828
config.VersioningMode = VersioningMode.ContinuousDeployment;
2929
steps.Enqueue(returnToStep);
3030
return StepResult.Ok();
31-
case "0":
3231
case "3":
32+
config.VersioningMode = VersioningMode.Mainline;
33+
steps.Enqueue(returnToStep);
34+
return StepResult.Ok();
35+
case "0":
36+
case "4":
3337
steps.Enqueue(returnToStep);
3438
return StepResult.Ok();
3539
}
@@ -43,14 +47,15 @@ protected override string GetPrompt(Config config, string workingDirectory)
4347
{0}
4448
1) Follow SemVer and only increment when a release has been tagged (continuous delivery mode)
4549
2) Increment based on branch config every commit (continuous deployment mode)
50+
3) Each merged branch against master will increment the version (mainline mode)
4651
{1}",
4752
!isPartOfWizard ? "0) Go Back" : string.Empty,
48-
isPartOfWizard ? "3) Skip" : string.Empty);
53+
isPartOfWizard ? "4) Skip" : string.Empty);
4954
}
5055

5156
protected override string DefaultResult
5257
{
53-
get { return "3"; }
58+
get { return "4"; }
5459
}
5560
}
5661
}

0 commit comments

Comments
 (0)