Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

And what about conflicts when syncing a forked repository?

Kris
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
January 20, 2016

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?

1 answer

0 votes
Kris
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
January 20, 2016

Verified on a test repository myself and adding the remote, merging manually and pushing seems to work without having to sync anymore.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events