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?
Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster ! While we’re all excited about the new improvements to Bitbucket ...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events