Skip to content

Commit fede286

Browse files
authored
Merge pull request #52 from codebtech/feat/create-builds
new build step with email
2 parents a841260 + c9d5e12 commit fede286

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/plugin-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
echo "password=${{ secrets.GITHUB_TOKEN }}" >> .git/credentials
5656
git fetch origin main-built
5757
git checkout -b main-built
58-
git merge origin/main-built
58+
git merge --allow-unrelated-histories origin/main-built
5959
git add -A # Stage all changes, including untracked files
6060
git clean -fdX
6161
git commit -m "Built WordPress plugin" --no-verify

0 commit comments

Comments
 (0)