Welcome to the Treehouse Community
The Treehouse Community is a meeting place for developers, designers, and programmers of all backgrounds and skill levels to get support. Collaborate here on code errors or bugs that you need feedback on, or asking for an extra set of eyes on your latest project. Join thousands of Treehouse students and alumni in the community today. (Note: Only Treehouse students can comment or ask questions, but non-students are welcome to browse our conversations.)
Looking to learn something new?
Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and a supportive community. Start your free trial today.
How to resolve conflict in a merge conflict?
How can we indicate that we've resolved a conflict, and merge our changes?
Alex KoumparosPython Development Techdegree Student 36,859 Points
Try rewatching the Resolving Merge Conflicts video. The appropriate command sequence is described at 2:43.