title: Gerrit and feature branches
body: <p>I'm started to work with feature branches in our repository that's connected to Gerrit but I do facing some issues when it comes to update those feature branches.</p>
  
  <p>What we've done is that we created a feature-branch from master. While we're developing in the feature branch, development is also ongoing in the master. What's the best practices (if any) to update the feature branch with the master branch?</p>
  
  <ol>
  <li>Rebase -> If we rebase from master and push it, all commits from master needs review again in feature branch.</li>
  <li>Merge -> It's not allowed to push merge commits.</li>
  </ol>