Skip to content

Commit f29bb16

Browse files
authored
Merge pull request #7 from SmartCityFlensburg/release/v0.0.1
New Release v0.0.1
2 parents 577e5bf + 3d697ac commit f29bb16

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/build-and-push-production.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ jobs:
4545
draft: false
4646
prerelease: false
4747

48-
- name: Merge main into dev branch
48+
- name: Merge main into develop branch
4949
uses: thomaseizinger/create-pull-request@1.0.0
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252
with:
5353
head: main
54-
base: dev
55-
title: Merge main into dev branch
54+
base: develop
55+
title: Merge main into develop branch
5656
body: |
57-
This PR merges the main branch back into dev.
58-
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
57+
This PR merges the main branch back into develop.
58+
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the develop branch.
5959
6060
- name: Checkout code
6161
uses: actions/checkout@v4

0 commit comments

Comments
 (0)