Hello, recently I had a contributor add a few comits to our GitHub repository (https://github.com/VenkSociety/More-Models). The commits are all fine, I’ve checked them myself, but it is still appearing to have merge conflicts. The only difference is that I made around one or two commits afterwards and their pull request undoes them.
Is it possible to ignore the merge conflicts and just proceed to accept the pull request. It’s really quite a hassle.
Thanks in advance,