How to resolve conflict in a merge conflict?
How can we indicate that we've resolved a conflict, and merge our changes?
Alex KoumparosPython Web Development Treehouse Moderator 33,515 Points
Try rewatching the Resolving Merge Conflicts video. The appropriate command sequence is described at 2:43.