Presenting a subset of commits on a branch as a github pull request

I forked a project on github.

I made commit 1,2,3,4 & 5 on my master branch.

I want to present commit 2 & 5 as a pull request to upstream, in such a way that when upstream acc开发者_开发百科epts, and I sync my branch with upstream, I don't get any conflicts.

What are the various ways I could do that?

---

You could:

• fetch the upstream branch
• rebase --interactive your branch on top of it, making sure commit 2 & 5 are re-ordered as commit 1 & 2
• submit those 2 commits as pull requests to the fork queue of upstream project.