Go to your local project and fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits will be stored in a local branch, remote_name/branch_name
$ git fetch <remote_name>
Check out the branch you want to merge into e.g. master
$ git checkout <base_branch>
Merge the changes from the feature branch
$ git merge <feature_branch>
If there's a conflict you can view it with
$ git status
Resolve the conflicts manually or with
$ git mergetool
Stage the files to indicate conflicts have been resolved.
$ git add <file>
Commit to finalize the merge
$ git commit -m "Conflicts resolved"
For more info see https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/