title: How to get "their" changes in the middle of conflicting Git rebase?
body: <p>I have conflicting branches, <code>feature_x</code> branched from <code>main</code>.</p>
  <p>Let's say when rebasing <code>feature_x</code> on current <code>main</code>, while resolving conflicts, I decide to take <strong>some</strong> (not all) of &quot;their&quot; (i.e. <code>main</code>) files as-is.
  How do I do that?</p>
  <p>I tried:</p>
  <pre class="lang-sh prettyprint-override"><code>git checkout main:foo/bar.java
  fatal: reference is not a tree: TS-modules-tmp:foo/bar.java
    
  git checkout refs/heads/main:foo/bar.java
  fatal: reference is not a tree: refs/heads/TS-modules-tmp:foo/bar.java
  </code></pre>