title: GIT : Maintains public forked project
body: <p>We have a public repo, a fork of node. We added some patches. These patches works with the version of node we used. </p>
  
  <p>We would like to update to the latest version of node. If we rebase, we will have clean patches (as we will have to fix them) on top of the latest version of node but we will break git pull on master...</p>
  
  <p>If we merge, patches we did will no longer make sense as they will be broken with the latest version of node. We will have to commit fixes afters the merge.</p>
  
  <p>What's the best way to handle that case ?</p>