Hi,

I'm not completely sure if this is the best way to achieve this, but I
you could instruct a merge driver to mark all new files as unset.

Cheers!
-Santiago.

On Thu, Jul 25, 2019 at 04:42:48PM +0300, Ilya Kantor wrote:
> Hi,
> 
> We're using Git to manage translations of an open-source book, and most of time it works well. But there's also a problem.
> 
> When we pull changes from upstream (English) to translation (e.g. Japanese), git auto-merges them.
> 
> Sometimes there conflicts, but not all the time.
> 
> For example, when a new file is added to English, it just gets auto-merged into Japanese.
> But all new changes must be human-controlled, translated. 
> 
> Is there a way to force git always generate a conflict, even if changes could be auto-merged?
> 
> ----
> Ilya
> https://urldefense.proofpoint.com/v2/url?u=https-3A__javascript.info&d=DwIFAg&c=slrrB7dE8n7gBJbeO0g-IQ&r=yZMPY-APGKyVIX7HgQFZJA&m=fywBEjNJhlI37lKNhH6u90hEOBCF5PqmRunhDCRO0Fg&s=We1ibeYQn4Z4Gf53M4CUyENq_BHhavulOg20KJIRxOg&e=