&gt; Do you ever run into merge conflicts in the build directory?<p>Those files should always be rebuilt fresh before committing. Just quickly do whatever to clear it from the conflict queue -- probably some version of &quot;take mine&quot; or &quot;take theirs&quot;. Merge the actual source files as necessary, then rebuild. Commit and just blindly clobber whatever existed in the build directory, because you just rebuilt it and you know it&#x27;s the correct version.