title: Avoding other team members commits in my merge
body: <p>I've recently moved from TFS to Git and like it pretty much. </p>
  
  <p>My team at work use git-flow. For each feature, we create a feature branch. However, one thing that seems to happen occasionally is that, when pushing the feature branch and creating a pull request into <code>master</code>, there will be a merge conflict. In order to solve that merge conflict, I sync the <code>master</code> branch with remote and merge <code>master</code> with my feature branch and solve that merge conflict.</p>
  
  <p>But now in my outgoing commits, not only will I have the "merge conflict fix" but I will also have all other commits in <code>master</code> that was made meanwhile, in that pull request. </p>
  
  <p>Because if I merge my local branch with my local <code>master</code> and push from the <code>master</code>, I will bypass the pull request (even if this is technically possible here) but doesn't seem right. Am I wrong? </p>
  
  <p>This problem isn't only during merge conflicts - I guess it's simply about keeping the feature branch in sync with the <code>master</code>. How do other people solve this? I've heard about rebasing but it seems like that is rarely being used in my team.</p>