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
A X
12,842 PointsMerging a Feature Branch after a Change to Master that Impacts the Work Done on the Feature Branch...What Happens?
Tommy's video he gave a real world example of working on a feature branch but needing to repair a bug in the master branch of TH, but he left completely undiscussed what happens to his feature branch he was working on after he modifies and commits the master changes he made to fix the bug with the users. Wouldn't his changes in the feature branch now be inaccurate since it'll contain the bug that he removed to master and reintroduce it to the master if he merges it into the master?
I therefore question the usefulness of feature branches since they may/could contain outdated code if the master is modified while working on a feature branch.
1 Answer
Jennifer Nordell
Treehouse TeacherHi there! The idea is that you continually pull from master after there has been a new commit to master. Take a look at this article and see if it helps. http://kentnguyen.com/development/visualized-git-practices-for-team/#comment-423841808
Here's another great one that's a little more visual: http://nvie.com/posts/a-successful-git-branching-model/
Good luck!
