I have the following scenario:
I suggest you to do a
git rebase for this scenario.
What it does is, checkout to branch you specify while doing a rebase, lets say you have pr#2 and pr#3 pending, You clone the repo and do while in the branch which generated the PR,
git rebase develop
It will say that rebase in prgress, so, you go and solve conflicts in that process, and do a
Now, the rebase either continue or stop if do not have more conflicts. If you have, you can read status in terminal, to continue,
git rebase --continue
Now, do that until all conflicts are resolved.
And finally when you checkout to the branch for that PR, you should see that there are NO conflicts, and branch can be automatically merged (by pushing to remote repo obviously).
Now, repeat the same process for pr#3, and you are done.
git rebase develop git add <files> git rebase --continue
repeat this for pr#3 also.