Skip to content

Commit

Permalink
Add user config for automated merge. (#25)
Browse files Browse the repository at this point in the history
  • Loading branch information
cmrigney authored Nov 13, 2023
1 parent c06375c commit 373269c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/merge-main-into-small-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
fetch-depth: 0
- name: Merge with main
run: |

This comment has been minimized.

Copy link
@juantreminio

juantreminio Oct 3, 2024

.github/workflows/merge-main-into-small-image.yml

git config user.name github-actions

This comment has been minimized.

Copy link
@510sss
git config user.email [email protected]

This comment has been minimized.

Copy link
@510sss

510sss Sep 16, 2024

cd welcome-to-docker

git fetch
git checkout small-image
git merge main --no-ff --no-edit

This comment has been minimized.

Copy link
@BDFC7

BDFC7 May 23, 2024

cd welcome-to-docker

Expand Down

1 comment on commit 373269c

@Jara72
Copy link

@Jara72 Jara72 commented on 373269c Feb 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gut

Please sign in to comment.