git flow: merging back to master which is different now

Question

I have this question.

1. Imagine I have 5 files on master
2. Imagine I make a new branch from master test
3. I go back to master, make commit