Development Tools Git Branches and Merging Merging Merging

How 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
MOD
Alex Koumparos
Python Web Development Treehouse Moderator 33,515 Points

Hi Belma,

Try rewatching the Resolving Merge Conflicts video. The appropriate command sequence is described at 2:43.

Cheers,

Alex

Thank 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 :-)