I just started working with a pull and fork model. I keep sync my fork and create a new branch when I have to fix something or for a new feature.
I'd like to know what to do when I have to face the following situation:
Let's suppose that I start creating a new feature
When I finish my new feature and before creating a pull request with this new branch, I find that my fork is 1 commit behind master, so I sync my fork and I get this:
Now my question is what I should do before sending the pull request? I think I should merge C4 into F2 but not sure if this is the correct approach or I should use rebase instead.