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

Development Tools Git Basics Merging Merge Conflicts

Posted by Chaim Yunger
Chaim Yunger
314 Points

resources on rebasing

Any good suggestions?

I'm a beginner but I'd like resources both for basics and for more complex situations.

1 Answer

Geoff Parsons
Geoff Parsons
11,679 Points
Geoff Parsons
Geoff Parsons
11,679 Points

I've always been a fan of the feature branch pattern wherein you create a new local (or remote) branch for each new feature you work on and keep master just for completed features. In more complex situations some people prefer to have a "development" branch for completed features not yet released and "master" is just for deployed code (in the case of web applications). You'd also want to employ tags in this case for releases. You can read more about this type of branch strategy here.