Merge and rebase remote branches <p>I have one local branch <code>master</code>, and track two remote branches <code>master</code> and <code>dev-me</code>. Meanwhile, another developer has his own local <code>master</code>, and tracks the same remote <code>master</code> and his own dedicate remote branch <code>dev-other</code>.</p> <p>From time to time, we each respectively push from own local <code>master</code> to remote dev branch (i.e. <code>dev-me</code> or <code>dev-other</code>). We then want to merge our remote <code>dev-x</code> branches into the remote <code>master</code> branch.</p> <p>I am thinking to do the following:</p> <ol> <li><p>Either of us <em>merges</em> his remote <code>dev-x</code> branch into remote <code>master</code> branch.</p></li> <li><p>The other person <em>rebases</em> from this merged remote <code>master</code> branch to his own remote <code>dev-x</code> branch.</p></li> <li><p>The same person from step 2) <em>merges</em> back to the remote <code>master</code> branch.</p></li> </ol> <p>Is this a correct approach?</p>