Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	GitVersion.yml
  • Loading branch information
jmmorato committed Oct 26, 2023
2 parents 6fb03c1 + 6ef81c3 commit 43d3adb
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ next-version: "3.250.2"
mode: ContinuousDeployment
update-build-number: true
tag-prefix: '(release-)?[vV]'
continuous-delivery-fallback-tag: ''

assembly-versioning-format: '{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber ?? 0}'
assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber ?? 0}'
Expand All @@ -13,10 +12,10 @@ branches:
regex: ^master$|^main$
mode: ContinuousDeployment
tag: ''
increment: None
increment: Patch
prevent-increment-of-merged-branch-version: true
track-merge-target: false
source-branches: [ develop ]
source-branches: [ ]
tracks-release-branches: false
is-release-branch: false
is-mainline: false
Expand Down

0 comments on commit 43d3adb

Please sign in to comment.