From 1ff5ac872497a40794b03503e4571fc5bbea697e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Darveau?= Date: Mon, 28 Jun 2021 16:35:26 -0400 Subject: [PATCH] Revert "chnage fork sync to merge instead of rebase" This reverts commit 7199a0b1168df98e91d0711698380e537a906330. --- .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 0b3f7e5..6a01093 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