On Wednesday, November 20, 2013 2:22:02 PM UTC-5, Greg Freeman wrote:

> Now that I'm actually digesting this and trying it out, I'm a bit 
> confused.  I am using source tree, but I will try and speak in more generic 
> terms.
> I forked the main repo through bitbucket ( which has master and develop 
> branches). This gives me https://<myname>@bitbucket.org/<myname>/<project 
> name>.git as the remote repository for my fork. So, I now have *my *fork 
> which has master and develop branches. I then set this fork up as my remote 
> repository (https://<myname>@bitbucket.org/<myname>/<project name>.git). 
> It seems to me it is off this development branch I want to create features. 
> I then push those features back to my repository and create a pull request 
> off that particular feature to the project repo. This will create a new 
> branch in the project repo which can then be merged into the project repo's 
> develop branch and then merged into everyone elses local repos. 
> Is this correct? 
> This brings up another question: when a fork is done on bitbucket, are the 
> develop and master branches in the user's fork ever merged with features? 
> For instance, do I ever add my feature to my develop branch? Or should my 
> develop branch only be updated from the project repos dev branch? Does this 
> question make sense? Basically, am I ever merging my features into my 
> develop and master branches directly?

The most up-to-date develop branch should be the one in the company 
account's repository, not the one in your fork. This is why I suggested to 
branch out from that branch instead of your repo (local or bitbucket). In 
my follow-up post, I also mentioned that I delete master and develop (or 
maint, or qa, or anything actually) from my personal repo (the forked 
repo). My personal bitbucket repo only contain my feature branches or 
maintenance fix branches.

My philosophy is that developers develop (create branches). They do not 
maintain code, that's why all the merging is done on the company repo. The 
developer then only pull/merge from that repo. The developer do not really 
need to have a redundant master/develop that can potentially be out of sync.

Hope this makes sense.



You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to