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://javascript.info
