git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [git for translators] How to always generate conflicts for merges?

From
Santiago Torres Arias <santiago@nyu.edu>
Date
Jul 25, 2019, 14:25 UTC
Message-ID
<20190725142533.5rcwl5frvv3bjx4s@LykOS.localdomain>
In-Reply-To
<C9A27ED4-CBD9-4FCD-B78F-8A1010D24D06@gmail.com>
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:
Show 16 quoted lines
> 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=
Previous: Ilya KantorNext: Junio C Hamano
Message 2 of 5 in “[git for translators] How to always generate conflicts for merges?”
  1. Ilya KantorJul 25, 2019
  2. Santiago Torres AriasJul 25, 2019
  3. Junio C HamanoJul 25, 2019
  4. Ilya KantorJul 25, 2019
  5. Sergey LukashevJul 26, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.