mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Santiago Torres Arias <>
To: Ilya Kantor <>
Subject: Re: [git for translators] How to always generate conflicts for merges?
Date: Thu, 25 Jul 2019 10:25:34 -0400	[thread overview]
Message-ID: <20190725142533.5rcwl5frvv3bjx4s@LykOS.localdomain> (raw)
In-Reply-To: <>

[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]


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.


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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2019-07-25 15:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-25 13:42 [git for translators] How to always generate conflicts for merges? Ilya Kantor
2019-07-25 14:25 ` Santiago Torres Arias [this message]
2019-07-25 16:37 ` Junio C Hamano
2019-07-25 17:42   ` Ilya Kantor
2019-07-26 20:40     ` Sergey Lukashev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190725142533.5rcwl5frvv3bjx4s@LykOS.localdomain \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).