Skip to content

Commit

Permalink
Use rebase + push
Browse files Browse the repository at this point in the history
This is mostly so that the linter stops complaining
  • Loading branch information
vHanda committed May 3, 2022
1 parent b740bde commit 01f8713
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@ func autoSync(repoPath string) error {
return tracerr.Wrap(err)
}

err = rebase(repoPath)
if err != nil {
return tracerr.Wrap(err)
}

err = push(repoPath)
if err != nil {
return tracerr.Wrap(err)
}

// -> rebase if possible
// -> revert if rebase fails
// -> do a merge
Expand Down

0 comments on commit 01f8713

Please sign in to comment.