title: Branch model for multiple projects in the same repository?
body: <p>We've recently switched from CVS to Git and are using Vincent Driessen's <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="nofollow noreferrer">successful Git branching model</a> with a <code>master</code> branch and a <code>develop</code> branch which merges back to <code>master</code>. We started with one project in Git and now we have two separate projects using some common code in a submodule (<code>common</code>). Recently the other project committed a change to <code>develop</code> that we aren't prepared for, and until we've updated our own code, we cannot commit any changes back to <code>develop</code> because we don't want the other changes.</p>
  
  <p>I thought about branching <code>develop</code> into project-specific branches which merge back into <code>develop</code>, but the owner of <code>common</code> doesn't want project-specific branches because: </p>
  
  <blockquote>
    <p>we’ll have to cherry pick commits from the main <code>develop</code> branch in
    order to obtain fixes or features that apply to both.</p>
  </blockquote>
  
  <p>Would it be better to eliminate the <code>develop</code> branch entirely and just merge directly from project-specific branches back to <code>master</code>, or are we doing this all wrong?</p>