title: git rebase and git push: non-fast forward, why use?
body: <p>I have a branch that should be available to other contributors and that should constantly stay up to date with the master.</p>
  
  <p>Unfortunately, every time I do 'git rebase' and then try to push, it results in 'non-fast forward' message and abortion of pushing. The only way to push here is to use --force. Does that mean I should use 'git merge' instead of rebasing if my branch went public and others are working on it?</p>