How to Resolve Merge Conflict in GitHub

Описание

This video explains about simple way to resolve the merge conflict in GitHub.

git checkout branch_name - Switch to the branch
git pull origin main - this command pull the main branch changes from remote and merge into this branch