Skip to content

Commit 2a65fe1

Browse files
More actions work (#104)
Because we will need to make the actions work to Signed-off-by: Rob Sewell <mrrobsewell@outlook.com>
1 parent 1dea5b4 commit 2a65fe1

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/deploy-module.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ jobs:
9494
- name: Merge main -> develop
9595
# This step merges the main branch into the develop branch after a successful deployment. This ensures that the develop branch includes the tag for the latest release.
9696
run: |
97-
git fetch --unshallow
97+
git checkout main
98+
git pull
9899
git checkout develop
99100
git pull
100101
git merge --no-ff main -m "Auto-merge main back to dev"

0 commit comments

Comments
 (0)