github encourages 1 fork per user, so that that user can work independently on a feature and then request that feature to be accepted into the main repository via pull request.
However, what if 2 developers need to collaborate on that feature? What is the ideal workflow for this? I could see a number of options:
- Both developers fork the original repository. Each developer pulls/pushes changes between each other’s repository. This seems like a lot of work (tiny micro operations) and also creates a delay between changes, so increases the window for conflicts.
- Developer 1 forks from the main repository, developer 2 forks from developer 1. Same as #1 mainly but hopefully simplifies Developer 2’s life a little?
- Developer 1 gives Developer 2 permissions to his own fork, so they both work out of the same central repository. Not sure if this is ideal.
I’m also curious where branches come into this. Obviously there would be a branch for the feature itself but that branch can’t exist in a single place, it would have to exist on multiple forks and be synchronized.
Basically just really confused about this workflow, would like an approach for how this can be best accomplished.
4
Create a feature branch for the functionality that you’d like to implement.
Both developers will pull a local copy of the feature branch. They can push incremental progress to the feature branch, and conflicts will be resolved via merging, should they arise.
EDIT
The way I would approach this problem:
- From the main, up to date repository, create a branch
git checkout -b FeatureBranch - Both users checkout this branch
git fetchandgit checkout FeatureBranch - Now each user has a local copy of FeatureBranch on their machine
- Each user is able to progress individually on their local branch, committing changes as they please. When enough progress is made, they can each push their changes to the remote branch
git push origin FeatureBranch. Git will handle merging automatically, unless a conflict arises that cannot be automatically resolved. In this event, the pusher will have to manually resolve it. - When the feature branch is ready to be merged back into master, issue a pull request, or
git merge
FYI I think you have your terminology mixed up in your post. Users should create a branch from the master branch, and upon completion of their work, they issue a pull request and the admins can decide to merge it in or not. Forking, at least in my mind, is reserved for taking a project at a certain point, and heading in a different direction with development. If a feature branch is intended to enhance the current code base, and fits the ideology and paradigm of the project, I would recommend branching.
Perhaps some more background information about your use case would be helpful.
6