From: Junio C Hamano <gitster@pobox.com> To: Alban Gruin <alban.gruin@gmail.com> Cc: git@vger.kernel.org Subject: Re: ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)] Date: Mon, 23 Nov 2020 11:15:40 -0800 Message-ID: <xmqqd003oper.fsf@gitster.c.googlers.com> (raw) In-Reply-To: <8c92f1d0-3f17-d8b2-ca93-c70ee887f37d@gmail.com> (Alban Gruin's message of "Sun, 22 Nov 2020 13:43:38 +0100") Alban Gruin <alban.gruin@gmail.com> writes: > There is some behaviour changes and regressions in this iteration that I > intend to fix. Expect a reroll soon. Thanks for a heads-up. > I also noticed that I can show which branch has made a branch when there > is a conflict with the "resolve" strategy, like "recursive" already > does. Should this change be part of this series, or should it be a > separate patch? Depends. If it is already a separate patch on your end, keeping it separate, and even holding it off until the other/larger parts of the series solidifies, would be a good idea, as I expect it would be fairly straight-forward change once you have the fundamentals ready. Thanks.
prev parent reply other threads:[~2020-11-23 19:19 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-21 22:57 What's cooking in git.git (Nov 2020, #04; Thu, 19) Junio C Hamano 2020-11-22 11:02 ` René Scharfe 2020-11-22 12:43 ` ag/merge-strategies-in-c [was Re: What's cooking in git.git (Nov 2020, #04; Thu, 19)] Alban Gruin 2020-11-23 19:15 ` Junio C Hamano [this message]
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=xmqqd003oper.fsf@gitster.c.googlers.com \ --to=gitster@pobox.com \ --cc=alban.gruin@gmail.com \ --cc=git@vger.kernel.org \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git