-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add user config for automated merge. (#25)
- Loading branch information
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 |
---|---|---|
|
@@ -17,6 +17,8 @@ jobs: | |
fetch-depth: 0 | ||
- name: Merge with main | ||
run: | | ||
This comment has been minimized.
Sorry, something went wrong. |
||
git config user.name github-actions | ||
This comment has been minimized.
Sorry, something went wrong. |
||
git config user.email [email protected] | ||
This comment has been minimized.
Sorry, something went wrong. |
||
git fetch | ||
git checkout small-image | ||
git merge main --no-ff --no-edit | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
1 comment
on commit 373269c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gut
.github/workflows/merge-main-into-small-image.yml