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

This widget could not be displayed.

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

This widget could not be displayed.

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 Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Posted Friday in Bitbucket

What is your #1 piece of advice to new users getting started using Bitbucket?

Hello Community! My name is Claire Maynard, and I’m a Product Marketing Manager on the Bitbucket team. I’m interested in hearing what advice or tips you have for new users getting started on ...

236 views 14 2
Join discussion

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