Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

I am new to BitBucket. I have my repository. And 2 people working on it me, Admin and another developer with Read only access.

So in order for him to do changes he forked repository and made changes, uploaded to his repository and created pull request.

Now I merged this pull request with my repository. And made few small changes afterwards and also committed them and uploaded to my repository.

What would be the next step for him to continue working? Does he have to fork it each time I make changes to my repo?

Is there some way for him to sync his with my repository without creating new fork each time?

share|improve this question
    
Shall this go to Stack Overflow? –  Dynamic Jul 24 '12 at 0:28
    
Its not programming specific question –  John Smith Jul 24 '12 at 3:55
    
The SO FAQ says it allows questions about software tools commonly used by programmers. Also, a quick search for the tag [bitbucket] shows 267 questions tagged. –  Dynamic Jul 24 '12 at 14:55

3 Answers 3

He should be able to pull changes from your repository just like you are pulling when he requests. In fact, it is considered good form to pull in upstream changes -- that would be changes from your repository in this case -- before submitting pull requests.

If I were working with the guy pretty heavily, I would probably just let him into the repository directly. Less hoo-ha in the workflow, easier for continuous integration.

share|improve this answer
    
He cannot pull since he's only has read access or can he? –  John Smith Jul 24 '12 at 17:33
    
Pulling is reading so I don't see why not? –  Wyatt Barnett Jul 24 '12 at 21:06

I'm not familiar with using Git on BitBucket since I'm more of a GitHub user, but since you're using Git, I assume that the solution will be the same.

After your collaborator forks your project into his own BitBucket account, and clones it into his local machine, all he needs to do is add the main repository as an upstream source for his fork:

git remote add upstream https://yourusername@bitbucket.org/yourusername/your_app_name.git

Your collaborator can now fetch the changes in your repository into his own by doing the following:

git fetch upstream

Note that this only fetches the changes and doesn't merge it, so your collaborator has to merge it into the master branch (or any branch) of his fork:

git merge upstream/master

Once that's done, he can now push the changes of the main repo into his own fork:

git push

share|improve this answer

This is and old question, but just for the sake of including an answer:

Your developer will notice in his forked repository a message saying that new changes has been included in the main repository (your repository), and he can merge those changes very easily.

The meessage is something like: This fork is XX commits behind "Sync now".

enter image description here

Best regards,

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.