How to handle git merge conflicts in git pull?

@elise_daugherty 

Here is how you can handle git merge conflicts in git pull:

1. Before starting the pull, make sure to commit or stash any changes you have made in your local repository to avoid conflicts.
2. Run the git pull command to fetch and merge changes from the remote repository into your local repository.
3. If there are no conflicts, the git pull will be successful and your local repository will be updated with the changes from the remote repository.
4. If there are conflicts, Git will show a message indicating that there are conflicts in certain files. You can use the git status command to see which files have conflicts.
5. Open the conflicted files in a text editor and look for the conflict markers (<<<<<<<, =======, and >>>>>>>). These markers indicate the conflicting changes that need to be resolved.
6. Manually edit the conflicted files to resolve the conflicts. You can choose to keep one version of the changes, combine both versions, or completely rewrite the changes.
7. After resolving the conflicts, save the files and add them to the staging area using the git add command.
8. Commit the changes using the git commit command to complete the merge process.
9. Finally, push the changes to the remote repository using the git push command to sync your local repository with the remote repository.

By following these steps, you can successfully handle merge conflicts during a git pull operation.