How to resolve merge conflict in a git pull request?

@edmond_brakus 

To resolve a merge conflict in a git pull request, follow these steps:

1. Check which files have conflicts by running git status in your terminal.
2. Open the file(s) with conflicts in your code editor.
3. Look for the conflict markers in the file (<<<<<<<, =======, >>>>>>). These markers show the conflicting sections of code.
4. Decide on the changes you want to keep from each side of the conflict. Edit the file to resolve the conflicts, removing the conflict markers and making sure the final code is correct.
5. Save the changes in the file.
6. Add the resolved file(s) to the staging area using git add
7. Once all conflicts are resolved and files are staged, commit the changes with git commit -m "Resolve merge conflict".
8. Push the commit to the remote repository with git push.
9. The pull request should now be resolved and can be merged successfully.