diff --git a/Readme.md b/Readme.md index 04c856e..a36398f 100644 --- a/Readme.md +++ b/Readme.md @@ -6,7 +6,7 @@ This Action is suitable if you: * have changes that are not going to be merged into upstream * want to keep changes based on the latest upstream -Basically this is doing `git rebase upstream master`. If there are conflicts, it simply fails. +Basically this is doing `git rebase upstream master && git push -f`. If there are conflicts, it simply fails. ## Typical usage @@ -31,12 +31,10 @@ jobs: # branch: master ``` -Waiting for https://github.com/actions/runner/issues/646. - ## Comparison * tgymnich/fork-sync and apps/pull: I don't want PRs. Besides there is not way to do a `git rebase` on GitHub website -* repo-sync/github-sync: It's not using rebase or merge. It completely mirrors the upstream. And it can't sync current branch +* repo-sync/github-sync: It's not using rebase or merge. It completely mirrors the upstream so that it can't sync current branch * wei/git-sync: Very complicated and have the same issue as github-sync. After all its aim is "syncing between two independent repo" -* aormsby/Fork-Sync-With-Upstream-action: It's `git pull`. It trys to be configurable on many args so that may be buggy +* aormsby/Fork-Sync-With-Upstream-action: If set `git_pull_rebase_config: true`, it's similar. But it tries to be configurable so that looks complex * This one: Not widely tested. Use with caution