How to not accept unwanted files when an author accepts a pull-request?

Question

git

1) I forked the project. Made corrections, created a pull-request.
2) the author of the project, after my fork created an additional folder in the project.
3) the author accepted the pull-request. everything is ok without conflicts.
4) I didn't have new folders and files added by the author after my fork in the repository (which is good)

5) I made a new pull-request. There were conflicts
6) the author resolved the conflicts himself and accepted the pull-request. As a result, master was also updated in my repository and I got those folders and files that were added by the author earlier

Question: how not to accept unwanted folders and files in this case?

Answer 1

If the absence of a new folder is necessary not only for you, but is due to some logic, then you can agree with the author of the original turnip to create an additional branch without this folder, use this branch and make PR into it.