We're using a A successful Git branching model by Vincent Driessen for our branching model. All's fine but I haven't really seen a particular issue brought up.
From what I've understood, when a new feature is required, you branch of the development
and create a new feature
branch. You would work on this and when you're done, you would merge this branch into the the development
branch.
What if a developer makes a feature and then merges that feature back to development
only to be found out that there's some bugs in the feature code. Where should this be fixed? Should a new fix
/bugfix
branch be started from development and the code be fixed there? I can't see another way.
How should one go about this?
Thanks