Probably a rank neubaphile question to follow…
I offer the following scenario for suggestions. I have a dev and a production branch of a web site project. Several files have settings that are exclusive to each branch. Such as using different databases for each branch. I don’t want the settings to change (become equal) on each branch during a merge. My understanding is that git doesn’t accommodate this scenario because it’s “file based”. I can’t tag a line to be ignored in a merge?