BeginnerLesson 8 of 1330 min · hands-on
Resolving Merge Conflicts
Part of the Git course
Want to learn Git Resolving Merge Conflicts in a real environment?
Click below, get a fresh Linux box with Git ready to go, and work through Resolving Merge Conflicts hands-on with an AI tutor that knows your code.
Start this lessonResolving Merge ConflictsWhat you'll learn
- Merge conflict markers
- Manual resolution
- Git add after resolving
- Git merge --abort
- Mergetool