[clug] Telling git to not update files across braches

[Scott Ferguson]

On 01/08/18 15:56, jm via linux wrote:
> Say you have a git repository where the branches represent different
> execution environments (eg, dev, staging, prod). Some files should be
> carried across when commands such as,
> 
> git merge dev
> 
> are executed. Other files hold environment specific settings and should
> not be carried over except possibly manually. Pulls from remote servers
> should be merge within the branch though. I've tries using
> .gitattributes with "merge=ours" but this doesn't seem to work. Does
> anyone have any possible solutions?
> 
> 
> Jeff.

"export-ignore" (??)


Kind regards
> 
> 
> 

-- 
    A: Because we read from top to bottom, left to right.
    Q: Why should I start my reply below the quoted text?

    A: Because it messes up the order in which people normally read text.
    Q: Why is top-posting such a bad thing?

    A: The lost context.
    Q: What makes top-posted replies harder to read than bottom-posted?

    A: Yes.
    Q: Should I trim down the quoted part of an email to which I'm reply

http://www.idallen.com/topposting.html