title: sync branch in two clones after rebasing
body: <p>I've got a repo cloned on two machines, and working over some time in the same branch (branch &quot;foo&quot;) on each. (Similar scenario: two people with clones working on the same branch.) I don't want to get too far behind on changes in the main branch, so will occasionally rebase the foo branch from main in one clone.</p>
  <p>What's the best way to get the other clone in sync?</p>
  <p>After the rebase in one clone, a force push is needed to update the remote. I can then fetch in the other clone. But if I try to pull, I'll have merge conflicts to contend with. I tried to pull with <code>--force</code> expecting that to work, but that still led to merge conflicts.</p>
  <p>In the second clone, I could use <code>reset --hard</code> to back up to the last commit in main, and then do  a fast-forward merge of foo branch. Is that the easiest way to do this?</p>