You can resolve merge conflicts using the command line and a text editor.| GitHub Docs
You can merge pull requests by retaining all the commits in a feature branch, squashing all commits into a single commit, or by rebasing individual commits from the head branch onto the base branch.| GitHub Docs