title: Better git workflow with two shared active branches
body: <p>We have git workflow close to one explained here <a href="http://nvie.com/posts/a-successful-git-branching-model/" rel="nofollow">A successful Git branching model</a></p>
  
  <p>Let's ignore release and hotfix branches, cause they don't relate to this issue. I have now three branches:</p>
  
  <ul>
  <li>master</li>
  <li>develop</li>
  <li>feature</li>
  </ul>
  
  <p>Now I am in team X and we start working on a feature branch called <code>feature/A</code>. Meanwhile, team Y is working on other feature branch <code>feature/B</code>. Team Y also finishes <code>feature/C</code>, and <code>feature/D</code></p>
  
  <p>Here, I am in a strange position. I need to keep up with <code>develop</code> branch because team Y has merged there. I also need to keep up with 'feature/A' branch cause other team members are making changes.</p>
  
  <p>My preferred way of keeping up with the changes - <code>rebase</code> cause lots of trouble as I need to constantly rebase in two different branches.</p>
  
  <p><code>merge</code> is somehow working, but I still think there must be better way. </p>
  
  <p>How do you work with such setups? I did try searching on how people work with it, but can't find any lead. </p>
  
  <p>The above workflow in the link also doesn't explicitly say anything about such setups. </p>
  
  <p>Hosting is on github.   </p>