Re: Request for adding a simple mechanism to exclude files from Git merge operation

[Philip Oakley <philipoakley@iee.email>]

On 20/06/2020 19:21, Tiran Meltser wrote:
> Hi,
> This topic is quite common in various use cases (e.g. production configuration vs. staging one) and there are quite a few talks about it in the web.
> Nevertheless, there is no specific solution to this problem, only partial workarounds (including the famous merge driver “ours”).
>
> I would like to suggest adding the git a simple and precise handling for the need to mark file(s)/folder(s) that are branch specific and should not be involved in merge operation at all.
>
> 2 suggestions I can think of are (but any good solution would suffice):
> • Adding additional merge strategy indication the file/folder is excluded from merges (e.g. merge=disabled/none/skip/…)
> • Adding a new configuration file (like .gitignore) for tracking these special files/folders, for example: .gitisolate/.gitquarantine/.gitbranchspecific/.gitsilo/…
>
> Any comment would be appreciated.
>
>
There has been a lot of previous discussion on "precious" files in the
past, but without any solid solution.
(https://lore.kernel.org/git/?q=precious+file to start).


There is a current thread on progressive merge resolution, where not all
conflicts can be resolved by one person at one time, which may also be
of interest.
https://public-inbox.org/git/BY5PR19MB3400DC6B6065C1FFF2ED289890990@BY5PR19MB3400.namprd19.prod.outlook.com/T/#m56b34554612b44be17e61da6486c1f709c2cfe54

Philip