{"thread":{"id":"52220","subject":"[PATCH] merge-strategies: Fix typo \"reflected to\"","startedAt":"2019-11-08T14:47:16Z","lastAt":"2019-11-11T02:03:18Z","messageCount":2,"participants":["Dominic Jäger","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"385786","messageId":"CAFOfB_LMQBOFK5PzhezcMGshmETY0agVK_iRW7vEayR9=Oyaow@mail.gmail.com","threadId":"52220","inReplyTo":null,"subject":"[PATCH] merge-strategies: Fix typo \"reflected to\"","fromName":"Dominic Jäger","fromEmail":"dominic.jaeger@gmail.com","sentAt":"2019-11-08T14:47:01Z","receivedAt":"2019-11-08T14:47:16Z","isPatch":true,"sender":{"key":"dominic.jaeger@gmail.com","avatar":null},"body":"reflected to\" does not exist (according to\nhttps://dictionary.cambridge.org/dictionary/english/reflect?q=reflected and\nhttps://www.merriam-webster.com/dictionary/reflected)\n\nSigned-off-by: Dominic Jäger <dominic.jaeger@gmail.com>\n---\nI only took a quick glance at the submitting patch guidelines.\nFeel free to quickly push this yourself if you want.\nAlso, I'm not native, so I hope I looked this up correctly.\n\n Documentation/merge-strategies.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/merge-strategies.txt\nb/Documentation/merge-strategies.txt\nindex aa66cbe41e..2912de706b 100644\n--- a/Documentation/merge-strategies.txt\n+++ b/Documentation/merge-strategies.txt\n@@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options:\n ours;;\n        This option forces conflicting hunks to be auto-resolved cleanly by\n        favoring 'our' version.  Changes from the other tree that do not\n-       conflict with our side are reflected to the merge result.\n+       conflict with our side are reflected in the merge result.\n        For a binary file, the entire contents are taken from our side.\n +\n This should not be confused with the 'ours' merge strategy, which does not\n--\n2.17.1\n"},{"id":"385859","messageId":"xmqq5zjrjhjy.fsf@gitster-ct.c.googlers.com","threadId":"52220","inReplyTo":"CAFOfB_LMQBOFK5PzhezcMGshmETY0agVK_iRW7vEayR9=Oyaow@mail.gmail.com","subject":"Re: [PATCH] merge-strategies: Fix typo \"reflected to\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-11T02:03:13Z","receivedAt":"2019-11-11T02:03:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Dominic Jäger <dominic.jaeger@gmail.com> writes:\n\n> reflected to\" does not exist (according to\n> https://dictionary.cambridge.org/dictionary/english/reflect?q=reflected and\n> https://www.merriam-webster.com/dictionary/reflected)\n>\n> Signed-off-by: Dominic Jäger <dominic.jaeger@gmail.com>\n> ---\n> I only took a quick glance at the submitting patch guidelines.\n> Feel free to quickly push this yourself if you want.\n> Also, I'm not native, so I hope I looked this up correctly.\n\nThanks, looks good.  Will queue.\n\n>\n>  Documentation/merge-strategies.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/merge-strategies.txt\n> b/Documentation/merge-strategies.txt\n> index aa66cbe41e..2912de706b 100644\n> --- a/Documentation/merge-strategies.txt\n> +++ b/Documentation/merge-strategies.txt\n> @@ -32,7 +32,7 @@ The 'recursive' strategy can take the following options:\n>  ours;;\n>         This option forces conflicting hunks to be auto-resolved cleanly by\n>         favoring 'our' version.  Changes from the other tree that do not\n> -       conflict with our side are reflected to the merge result.\n> +       conflict with our side are reflected in the merge result.\n>         For a binary file, the entire contents are taken from our side.\n>  +\n>  This should not be confused with the 'ours' merge strategy, which does not\n> --\n> 2.17.1\n"}]}