So this is my first real use of git. I set up a private repository at bitbucket and gave my partner read only access. He forked and gave me read only access to his fork.
We have a master branch and a development branch, each. I guess my real question is how I should set up the branches and which should be remote tracking.
Right now I see:
Code:
master
dev
bitbucket/master
bitbucket/dev
partner/master
partner/dev
none of which are remote tracking.
My intent was for me to fetch from partner and push to bitbucket. My partner would fetch from me and push to his bitbucket. We're considering my local repo sort of the main repo, my bitbucket a mirror of that so he can access it. His bitbucket repo is just a mirror of his local one so I have access.
His view is slightly different because he forked on bitbucket and did a clone of his fork. His master is a remote tracking branch of his-bitbucket/master and likewise for dev / his-bitbucket/dev.
Am I making this too complicated? What I thought would be simplest is if we had different remotes for push/fetch so my master branch would be a remote tracking branch of bitbucket/master for pushing and a remote tracking branch of partner/master for fetching. Is this possible?
Edit: Also, each of our respective bitbucket remotes have mirror=true
