- Sync an out of date branch of a fork from the Web
- Originally posted by The GitHub Blog
- The Nuggets translation Project
- Permanent link to this article: juejin.cn/post/696331…
- Translator: Hoarfroster
- Proofread by: Hoarfroster
I don’t know if you have
- The main fork is dead (x).
- You want to synchronize branches
- GitHub only supports Merge
- Merge results in unnecessary Commit records
Git command line. But now, times have changed!
You can now synchronize an expired Fork with its upstream on the Web side. If there are no merge conflicts between branches, the branches of a Fork may be updated by fast-forwarding or by Merging from upstream branches. If there is a conflict, you will be prompted to open a pull request.
The following image shows synchronizing a Fork (the branch upstream of which so far has no conflicts) :
Sync an out of date branch of a fork from the web
You can now use the web UI to synchronize an out of date branch of a fork with its upstream branch. If there are no merge conflicts between the branches, the fork’s branch is updated either by fast-forwarding or by merging from the upstream’s branch. If there are conflicts, you will be prompted to open a pull request to resolve.
Fetch upstream up to date, no conflict, and conflict flows