metfasad.blogg.se - Git create branch on github

#GIT CREATE BRANCH ON GITHUB CODE#

This provides the most stable set of branches and code. Branch the feature, do whatever preliminaries are needed. Note that this starts with a branch from dev and ends with a merge to dev.Īll that said, probably the best thing to do is to avoid doing a merge from one feature to another feature.

#GIT CREATE BRANCH ON GITHUB CODE#

However, if this is new feature that depends code that isn't yet found in dev, the flow should be:

Take a little bit more time for someone to understand its role. The reason is that the start and the end don't match - it makes it a little bit harder to understand what this is and was.

verify functionality (and additional commits) in feature branch.

merge from dev once required-feature is complete.

What you want to avoid however is something that looks like: It branches from the feature branch, commits some code and merges back to the feature branch (or is discarded). If the branch from a feature branch is a "I want to explore this way of fixing a problem in that feature branch" - perfectly fine. A codeline may pull in code from other codelines at any time if it is necessary. Hot fixes branch and merge from master (with that additional merge back to dev).Įach codeline branches from and merges back to its parent. Feature branches branch and merge from dev, release branches branch and merge from dev (with an additional merge to master). This is typically a merge from the mainline (in git-flow this is dev).

Ideally, all branches merge back to the codeline they were merged from.

A key thing that git-flow was intended to address was the ability to reason about the role of a given branch, and what it branches from and merges to.