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. 10x, Tiran Meltser ________________________________ This e-mail message may contain confidential or proprietary information of Mavenir Systems, Inc. or its affiliates and is intended solely for the use of the intended recipient(s). If you are not the intended recipient of this message, you are hereby notified that any review, use or distribution of this information is absolutely prohibited and we request that you delete all copies in your control and contact us by e-mailing to security@xxxxxxxxxxx. This message contains the views of its author and may not necessarily reflect the views of Mavenir Systems, Inc. or its affiliates, who employ systems to monitor email messages, but make no representation that such messages are authorized, secure, uncompromised, or free from computer viruses, malware, or other defects. Thank You
