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?
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?
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!
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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