This question is in reference to Atlassian Documentation: Resolve merge conflicts
The documentation describes how to resolve conflicts when merging branches, but forgets to detail how to do this when syncing a forked repository with its master. A fetch on the forked repository wont pull in any commits of the master repository.
Should you add the master repository as a remote, merge manually and then push the forked repository back? Should you still sync afterwards?
Verified on a test repository myself and adding the remote, merging manually and pushing seems to work without having to sync anymore.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.