git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (May 2020, #05; Thu, 14)
Date: Fri, 15 May 2020 08:25:41 -0700	[thread overview]
Message-ID: <CABPp-BF2Nh8LntDfw7-zSry00QKWg68qKOFW9QHvtqrSvU=Utw@mail.gmail.com> (raw)
In-Reply-To: <xmqqpnb6nk7x.fsf@gitster.c.googlers.com>

On Thu, May 14, 2020 at 6:33 PM Junio C Hamano <gitster@pobox.com> wrote:
> * en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit
>  - merge-recursive: fix rename/rename(1to2) for working tree with a binary
>
>  When a binary file gets renamed and then merged with a minor
>  change, the copy on the working tree while conflict resolution
>  sometimes got "their" version and not "ours".

This summary feels misleading; it's not simple rename + content merge,
it's double rename + content merge.  Perhaps:

When a binary file gets modified and renamed on both sides of history
to different locations, both files would be written to the working
tree but both would have the contents from "ours".  This has been
corrected so that the path from each side gets their original content.

  parent reply	other threads:[~2020-05-15 15:25 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-14 23:57 What's cooking in git.git (May 2020, #05; Thu, 14) Junio C Hamano
2020-05-15 10:16 ` Derrick Stolee
2020-05-15 14:58   ` Junio C Hamano
2020-05-15 15:25 ` Elijah Newren [this message]
2020-05-15 18:06   ` Junio C Hamano
2020-05-18 19:57 ` Taylor Blau
2020-05-19  9:32 ` Jacob Keller

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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

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

  git send-email \
    --in-reply-to='CABPp-BF2Nh8LntDfw7-zSry00QKWg68qKOFW9QHvtqrSvU=Utw@mail.gmail.com' \
    --to=newren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* 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. 
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 NNTP newsgroup(s).