-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
457a67e
commit ac53dfe
Showing
1 changed file
with
3 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,8 +39,11 @@ jobs: | |
git config --global user.email "[email protected]" | ||
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. |