Re: Git Merge 2020 slides and reproducibility

From: Konstantin Tokarev <annulen@yandex.ru>
Date: Mar 7, 2020, 13:38 UTC
Message-ID: <3165171583586403@sas1-2bf44b70450e.qloud-c.yandex.net>
In-Reply-To: <CABPp-BHk0TyxEgudMX_-zzpFsUPHCmRkvZezN_49J2ivi2-N+w@mail.gmail.com>

06.03.2020, 18:00, "Elijah Newren" <newren@gmail.com>:

Show 11 quoted lines

> Hi,
>
> Had a few different folks ask me at Git Merge about slides for my
> talk. I said I'd post them on github somewhere, but in case you were
> one of the folks and have a hard time finding it...they are up at
> https://github.com/newren/presentations/blob/pdfs/merge-performance/merge-performance-slides.pdf
> and steps to reproduce the speedups I got can be found at
> https://github.com/newren/git/blob/git-merge-2020-demo/README.md
> (though be forewarned that the code is has lots of fixmes & ifdefs &
> other problems, has awful commit messages, etc.; I will be cleaning it
> up soon).

Hello, I've just tried your branch on my repository and it seems like it can be a salvation from all rename-related pain that I'm regularly facing when doing merges and cherry-picks! Thank you very much, I hope it will be integrated into mainline soon.

However, when testing my previous merges which had to be done with helper script, I've encountered case of

CONFLICT (directory rename split)

Is there any way to prevent conflict in this case if files are the same, and merge their contents if there are differences? I think it would be reasonable to assume that move done in newest commit should win, and allow user to change strategy via command line option, provide explicit hint where files should be moved, or maybe even decide it interactively.

-- 
Regards,
Konstantin