Скачать или смотреть GitHub Conflicts (Open Pull Request now behind and I resolve a few types of conflicts)

I was asked to resolve some GitHub conflicts. In this conflict I did a pull request and it was able to merge automatically on GitHub. However, another pull request was accepted before mine so it then had conflicts and I had to resolve those. I resolve the GitHub conflicts in real time. We have been having conflicts with this project. For example, the log.txt should have been on the .gitignore which I run into conflicts. Also a couple other files that I did not change so I had to delete and accept the new files. I was not given the option to resolve on the .mf file, but I was asked to resolve the DS_STORE file and I accepted the newest one. I try to explain everything and hopefully watching this will be help someone with their GitHub conflicts. Thanks for watching!