CyanogenMod/android — comment on commit 89acec784fd50305cc55d05ecb3416fcd7c3eb0e
File:  line 0
By IngCr3at1on:

You can also put your changes in android.mk so that merge conflicts are avoided, something like what I did for the blaze would work.
https://github.com/IngCr3at1on/android_vendor_cyanogen/blob/gingerbread/products/AndroidProducts.mk
The same work around can be found on the inferior human organs tree for thunder c