forked from jax-ml/jax
-
Notifications
You must be signed in to change notification settings - Fork 4
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
007f982
commit cb5f909
Showing
1 changed file
with
2 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 |
---|---|---|
|
@@ -34,6 +34,8 @@ jobs: | |
git checkout origin/main | ||
git checkout -b $SYNC_BRANCH_NAME | ||
# Try and merge rocm-main into this new branch so that we don't run upstream's CI code | ||
git config --global user.email "[email protected]" | ||
git config --global user.name "GitHub Actions" | ||
git merge origin/rocm-main || true | ||
# If the merge creates conflicts, we want to abort and push to origin anyways so that a dev can resolve the conflicts | ||
git merge --abort || true | ||
|