From: Konstantin Tokarev <annulen@yandex.ru>
To: Elijah Newren <newren@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: Git Merge 2020 slides and reproducibility
Date: Sat, 07 Mar 2020 16:38:44 +0300 [thread overview]
Message-ID: <3165171583586403@sas1-2bf44b70450e.qloud-c.yandex.net> (raw)
In-Reply-To: <CABPp-BHk0TyxEgudMX_-zzpFsUPHCmRkvZezN_49J2ivi2-N+w@mail.gmail.com>
06.03.2020, 18:00, "Elijah Newren" <newren@gmail.com>:
> 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
next prev parent reply other threads:[~2020-03-07 13:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-06 15:00 Git Merge 2020 slides and reproducibility Elijah Newren
2020-03-06 16:40 ` Derrick Stolee
2020-03-06 18:25 ` Matheus Tavares Bernardino
2020-03-07 13:38 ` Konstantin Tokarev [this message]
2020-03-07 16:03 ` Elijah Newren
2020-03-07 19:38 ` Konstantin Tokarev
2020-03-09 15:50 ` Elijah Newren
2020-03-10 14:36 ` Konstantin Tokarev
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3165171583586403@sas1-2bf44b70450e.qloud-c.yandex.net \
--to=annulen@yandex.ru \
--cc=git@vger.kernel.org \
--cc=newren@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).