I'm trying to work out if it is possible to come up with a solution for branching by feature even if part of my application is based on inherently non-mergeable (i.e. binary) files.
The only (obvious) ideas I have come up with:
- Keep a note of all changes and merge by hand
- Implement merge in the tool that generates the files
I fear that those are the only options available, is there something 'clever' I might be missing?