title: Is there a way to merge only a subdirectory in git?
body: <p>We have 2 directories in the project: <code>backend</code> &amp; <code>frontend</code>. We're working on same feature branch, let's call it <code>feature-branch</code>, both FE and BE.</p>
  
  <p>FE is adding changes only to <code>frontend</code> dir, BE only to <code>backend</code> dir.</p>
  
  <p>Now I want to merge <code>master</code> to <code>feature-branch</code>. However, there are conflicts both in BE &amp; FE. I'm BE engineer, so I don't know how to resolve the FE conflicts. Is there a way to merge only changes from BE dir, push those changes and then ask the FE engineer to merge the FE changes?</p>
  
  <p>p.s. <code>feature-branch</code> is our main feature branch. We're creating subbranches from that one and direct our PRs towards that <code>feature-branch</code>. We don't push directly to that branch.</p>