Docker/flame
Docker/flame
1
0
Fork 0
mirror of https://github.com/pawelmalak/flame.git synced 2025-08-02 17:35:17 +02:00
Code Issues Releases Wiki Activity

Revert "chnage fork sync to merge instead of rebase"

Browse source 
This reverts commit 7199a0b1168df98e91d0711698380e537a906330.
This commit is contained in:
François Darveau 2021-06-28 16:35:26 -04:00
parent b48a9cedb8
commit 1ff5ac8724
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/merge-upstream-master.yml vendored
View file

@ -29,7 +29,7 @@ jobs:
upstream_repository: pawelmalak/flame
upstream_branch: master
target_branch: master
# git_pull_rebase_config: true
git_pull_rebase_config: true
# git_pull_args: --ff-only # optional arg use, defaults to simple 'pull'
# github_token: ${{ secrets.GITHUB_TOKEN }} # optional, for accessing repos that require authentication