Maybe this has been answered elsewhere, but I'm looking for tips on helping me manage our installation.

The challenge comes from trying to maintain/merge multiple add-ons that have both made modifications to the same files.

I'm discovering that I'm almost spending as much time trying to keep this all straight as I am doing anything else. As my cart grows and is modified, it's becoming more of a challenge to keep it straight. Not only that but it becomes a huge undertaking to update to the latest release.

What's worked for you?