Skip to content

Commit

Permalink
Added Go setup for autoresolving conflicts (#463)
Browse files Browse the repository at this point in the history
Signed-off-by: Oleg Solodkov <oleg.solodkov@xored.com>
  • Loading branch information
sol-0 authored Dec 29, 2021
1 parent f5e3790 commit d375517
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ jobs:
git config --global user.name "NSMBot"
git config pull.rebase false
git pull -q origin main -s ort -X theirs
- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: 1.16
- name: Re-generate go.sum
run: go mod tidy
- name: Push changes
Expand Down

0 comments on commit d375517

Please sign in to comment.