From 32bfe33a755f4ef5d1301318a1bb1fe15c67e6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Darveau?= Date: Mon, 28 Jun 2021 18:25:29 -0400 Subject: [PATCH] another test --- .github/workflows/merge-upstream-master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-upstream-master.yml b/.github/workflows/merge-upstream-master.yml index 6a01093..694a272 100644 --- a/.github/workflows/merge-upstream-master.yml +++ b/.github/workflows/merge-upstream-master.yml @@ -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