Skip to content

Commit

Permalink
doc update
Browse files Browse the repository at this point in the history
  • Loading branch information
imba-tjd committed Mar 16, 2021
1 parent 6b74a3d commit 3727d50
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

0 comments on commit 3727d50

Please sign in to comment.