I created a branch from master and submitted 2 commits on the branch.
Now I need to merge the branch back into master, somehow the master has changed, I will merge more commits into master than just my 2 commits.
What's the best solution here? Can I just move the branch ( with 2 commits) into the new master? I mean, if I want merge into master, I should only submit the 2 commits. And I hope what I do will not affects others who working on the same repository.
I tried git rebase, but it messes with many commits than just these 2.