From: Junio C Hamano <email@example.com> To: Elijah Newren <firstname.lastname@example.org> Cc: Git Mailing List <email@example.com>, Adam Dinwoodie <firstname.lastname@example.org>, David Turner <email@example.com>, David Turner <firstname.lastname@example.org> Subject: Re: [PATCH] merge-recursive: ignore_case shouldn't reject intentional removals Date: Sun, 26 Nov 2017 11:32:11 +0900 [thread overview] Message-ID: <email@example.com> (raw) In-Reply-To: <CABPp-BGcfFOvv+-uW2_EaftLiU-xs_D4g8hsYOZqjk1XwK_8Fw@mail.gmail.com> (Elijah Newren's message of "Sat, 25 Nov 2017 14:35:46 -0800") Elijah Newren <firstname.lastname@example.org> writes: > I had another email I had been composing to try to argue for changing > merge-recursive.c's design to the above, assuming I could get the time > to work on it. Nice to see that I'm not crazy, and that I apparently > don't need to do much convincing. :-) You might even be better off coming up with a *new* merge strategy backend if you want to do this, without using much from the existing code in merge-recursive.c at all (I've written off that code as mostly unsalvageable long time ago, and thanked for whoever had a clever idea to allow different strategy backend to be made without disrupting the rest of the system). After we gain more confidence with the rewrite, we can switch the internally built-in backend used by different codepaths from merge-recursive.c::merge_recursive() to the new thing.
next prev parent reply other threads:[~2017-11-26 2:32 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-24 19:59 Elijah Newren 2017-11-24 20:04 ` Eric Sunshine 2017-11-24 20:29 ` Elijah Newren 2017-11-25 3:29 ` Junio C Hamano 2017-11-25 22:35 ` Elijah Newren 2017-11-26 2:32 ` Junio C Hamano [this message] 2017-11-27 3:40 ` Junio C Hamano 2017-11-27 16:40 ` Elijah Newren 2017-11-27 23:39 ` Junio C Hamano 2017-11-28 1:02 ` Elijah Newren 2019-03-04 23:07 Woody Woodman 2019-03-06 14:23 ` Johannes Schindelin
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 \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH] merge-recursive: ignore_case shouldn'\''t reject intentional removals' \ /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
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).