Welcome to the Treehouse Community
Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community! While you're at it, check out some resources Treehouse students have shared here.
Looking to learn something new?
Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.
Start your free trial
Lucas Krause
19,924 PointsMerge feature branch into master branch?
Git-flow seems really cool to me but there's one thing I'm not quite sure about. In the code challenge following this video the last task is:
Now you can get back to working on your feature. When your feature is finished, what command would you use to finish the feature and merge everything back into master?
I typed in git flow feature finish profiles ("profiles" is the name of the feature branch). Assuming that the integration branch is called "integration" (or anything else different from "master") the feature branch will be merged into the "integration" branch rather than into the "master" branch, wouldn't it?
I'm just a bit confused because the task asks for merging the feature branch into the "master" branch.
2 Answers
Alex Alexander
5,673 PointsYes, as far as I understand, you're correct. I think the code challenge's wording is just off.
In reality, you would git flow feature finish <feature name> to merge into the development (aka "integration") branch. Then, presuming the feature is complete, you'd use git flow release start <version number> and work in that branch to iron out any bugs, until finally using git flow release finish <version number> which will merge the final build back into both the master branch and the development branch.
This article from the teacher's notes on the video is a succinct and helpful overview.
Tony Swanson
2,562 Pointsgit flow feature finish profiles