I've chosen 'Enable fork synching' for a fork. Now what?

A couple of things.

Firstly; do i have to do anything or will this just happen? It appears that it will just happen. But - are all branches synched? And what if there are conflicts?

Secondly:

I've run git remote -v

I was expecting to see something like:

 

origin https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
# origin https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)
# upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (fetch)
# upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git (push)

(taken from Github's tutorial on this subject).

But I don't see the upstream ones. Can I just assume origin is being synched and I'll get that when I pull?

 

Thanks.

--JustinWyllie

 

 

 

2 answers

Hi Justin,

Fork synching will automatically update the branches in a fork with any fast-forward changes from the upstream repository. If there are conflicts, or indeed if there are any changes to your local fork that haven't been pushed to the upstream repository, Stash will not automatically synch your fork. Instead it will offer a manual "Synchronize" button in the UI. 

It won't (and in fact, can't, afaik) update the remotes you have configured in your local repository as you're suggesting. You could configure an upstream remote yourself using the command git remote add upstream <upstream_git_url> if you wanted to?

Our documentation has more information on fork synchronization.

Hope this helps!

Tim

I'm guessing I would see the Synchronise button in Settings... Fork Synching? I haven't modified any forked branches so it is all happening automatically. Thanks,

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

1,743 views 1 5
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