Hi Philip, First - thanks for taking the time to comment on the issue. Second - as for the "precious" file, not sure this is my case; it could go there, but as you indicated it has been around for some time without progressing anywhere. Third - the last link you sent doesn't seem to be related to my issue as it deals with complex merges, while my request is very simple - give the ability to mark files/folders as omitted from a merge operation (branch specific files). IMHO this feature isn't complicated and can bring lots of benefits to the table. Hope someone will take up the glove... Tiran. -----Original Message----- From: Philip Oakley <philipoakley@iee.email> Sent: Sunday, June 21, 2020 6:43 PM To: Tiran Meltser <Tiran.Meltser@xxxxxxxxxxx>; git@xxxxxxxxxxxxxxx Cc: Amir Yosef <Amir.Yosef@xxxxxxxxxxx> Subject: [E] Re: Request for adding a simple mechanism to exclude files from Git merge operation [EXTERNAL EMAIL] DO NOT CLICK links or attachments unless you recognize the sender and know the content is safe. 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@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/T/#m56b34554612b44be17e61da6486c1f709c2cfe54 Philip ________________________________ 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
