Making Git retain different section content between branches

Question

I\'m developing a Userscript that my employers have asked me to begin to manage via Git.

Right now, I have a stable file and a beta file, so that everyone in the org

Answer 1

You could write a custom merge driver for git, and configure git to use it - but this would probably be more trouble than it's worth.