Closed tmcw closed 12 years ago
I workaround this problem in D3 by doing a make clean all
after merging, and then adding the generated files. You still get conflicts on merges, but resolving them is trivial since those files are generated.
Closing as good enough.
Git's pretty terrible about merging built
modestmaps.min.js
files - you think it's doable to not commit builds in branches, and just build after merging? This would require a tweak to the README to tell users that they won't get prebuilt versions of the code in branches.