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
Belma Gaukrodger
17,826 PointsHow to resolve conflict in a merge conflict?
How can we indicate that we've resolved a conflict, and merge our changes?
1 Answer
Alex Koumparos
Python Development Techdegree Student 36,887 PointsHi Belma,
Try rewatching the Resolving Merge Conflicts video. The appropriate command sequence is described at 2:43.
Cheers,
Alex
Belma Gaukrodger
17,826 PointsBelma Gaukrodger
17,826 PointsThank you Alex! I managed to get the right answer for the quiz eventually. I was 'over-thinking' the answer when a much simpler response was needed :-)