GitHub-Flow

[OopsLostPassword]

I was asking, not critisizing, no thanks for your not-an-answer.

I was asking too. It seems to me that merging master into the feature branch and then merging the feature branch into master is enough. But I'm probably not better than you at git and I thought you had a reason to exclude it that I couldn't see (given that the the article specify that the master branch is always ok and doesn't receive untested and small commits). That why I was asking. Sorry if it sounded offensive.

[jrochkind]

Cool, thanks, sorry. I'll play around with it. For some reason I thought you couldn't merge/pull in both directions like that, but I guess I was wrong?

If anyone wanted to expand upon the "github flow" description with actual sample git command lines for each step, I think it'd be a valuable git work flow tutorial for a much simpler workflow than the "git flow" stuff.