From ac53dfe8ea2d605782e6c59d09086f24856bab2d Mon Sep 17 00:00:00 2001 From: Will Hickey Date: Tue, 5 Mar 2024 16:54:14 -0600 Subject: [PATCH] Add debugging prints --- .github/workflows/update_upstream_from_fork.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/update_upstream_from_fork.yml b/.github/workflows/update_upstream_from_fork.yml index 82c131f..b2985d1 100644 --- a/.github/workflows/update_upstream_from_fork.yml +++ b/.github/workflows/update_upstream_from_fork.yml @@ -39,8 +39,11 @@ jobs: git config --global user.email "will.hickey@anza.xyz" git config --global user.name "GHA: Update Upstream From Fork" git fetch --all + git show remotes/upstream/master + git show origin/master git checkout -b temp_branch remotes/upstream/master git cherry-pick remotes/upstream/master..origin/master git push upstream master shell: bash +# TODO add a bunch of debugging prints about the state of commits so if cherry-pick fails we can figure it out. \ No newline at end of file