> Do you ever run into merge conflicts in the build directory? Those files should always be rebuilt fresh before committing. Just quickly do whatever to clear

> Do you ever run into merge conflicts in the build directory? Those files should always be rebuilt fresh before committing. Just quickly do whatever to clear it from the conflict queue -- probably some version of "take mine" or "take theirs". 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's the correct version.