Git - Models with composition and branches -

Git - Models with composition and branches -

according @nvie's definition of feature branch, think every class of project should feature branch.

for example:

git checkout -b auto develop git checkout -b wheel develop git checkout -b engine develop

and in each branch, define implementation of classes related named one, such wheel, wheel_dao, wheel_composite.

in case, car owner of wheel , engine. guess merging wheel , engine branches car's correct.

w---\ \ ------c / e---/

but found terrible due fact engine , wheel still new commits, every time commit added branches, merge 1 time again car.

i share me article can find more info using git models (mvc maybe?). or perhaps guys can tell me more appropriate way branch composition.

your first impression

according @nvie's definition of feature branch, think every class of project should feature branch.

is certainly off mark. the article states

the essence of feature branch exists long feature in development, merged develop

and regarding develop branch

we consider origin/develop main branch source code of head reflects state latest delivered development changes next release. phone call “integration branch”. this automatic nightly builds built from.

so strictly definition, if restrict feature branch single class, must restrict changes class non-breaking (of build), or else not merge develop branch straight it.

now, if you're next model-view-controller pattern, should have unit tests , ideally integration tests. whenever add together feature, should want know when it's complete, each feature should introduce new tests or modify existing ones.

so reply question, (usually) appropriate way branch composition decide tests describe feature , include changes verifiable tests.

try believe usefulness of git workflow largely dictated testing workflow.

git model-view-controller git-branch git-flow