And what about conflicts when syncing a forked repository?

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

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 Join to answer
Community showcase
Alexey Matveev
Published Saturday in Jira

How to run Jira in a docker container

Everything below is tested on Ubuntu 17.10. I prefer to use Jira in a docker container because: 1. I can install Jira with a couple of commands. 2. I can start and stop Jira just by starting and s...

90 views 2 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot