- Create a pull request - See the list of files with conflicting changes - If the conflicts are related to competing line changes, resolve it using the GitHub's conflict editor - For other types of merge conflicts, such as removed file, use the command line to resolve them - After resolving all merge conflicts and verifying that the project still works, merge the pull request