makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6723 from marc1706/ticket/17394

Browse source 
[ticket/17394] Merge local 3.3.x and not remote into master
This commit is contained in:
Marc Alexander 2024-09-28 16:52:12 +01:00
commit d8dc1204c2
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/check_merge_to_master.yml vendored
View file

@ -35,7 +35,7 @@ jobs:
id: merge_master id: merge_master
run: | run: |
git checkout master git checkout master
if git merge --no-ff origin/3.3.x --no-commit; then if git merge --no-ff 3.3.x --no-commit; then
echo "mergeable=true" >> $GITHUB_OUTPUT echo "mergeable=true" >> $GITHUB_OUTPUT
else else
echo "mergeable=false" >> $GITHUB_OUTPUT echo "mergeable=false" >> $GITHUB_OUTPUT