Git Tutorials

Instructional Training Videos

Learn Git: How to Resolve Merge Conflicts in Git

Advanced Git Tutorial

How do you resolve merge conflicts in Git?

Watch this advanced Git tutorial video to learn more about merge conflicts in Git and when they occur.

When Git is unable to automatically resolve differences in code between two commits because there are conflicting changes to the same line of code, a merge conflict occurs. Merge conflicts in Git can happen when merging a branch, rebasing a branch, or cherry picking a commit.

See how to communicate with Git to resolve a merge conflict and proceed with your merge, rebase, or cherry pick.

Additional Resources

Make Git Easier, Safer &
More Powerful

with GitKraken