Better Pull Requests

[xavs]

Hi there, I was wondering if this the gitflow process / PR review could be improved like this:

A feature branch makes changes to X files. PR submitted.
develop branch has N new commits that affect 1 out of those X files in the PR, so a merge conflict shows in the PR.

It'd be really cool if there was an easy command that would merge only conflicting files from "develop" , so the PR still looks nice and clean.
Do yo reckon this is possible?

Thanks