Re: [PATCH v4 04/12] merge-tree: implement real merges

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Subject: Re: [PATCH v4 04/12] merge-tree: implement real merges
From: Junio C Hamano <gitster@xxxxxxxxx>
Date: Mon, 14 Feb 2022 09:51:33 -0800
Cc: git@xxxxxxxxxxxxxxx, Christian Couder <chriscool@xxxxxxxxxxxxx>, Taylor Blau <me@xxxxxxxxxxxx>, Johannes Altmanninger <aclopte@xxxxxxxxx>, Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx>, Johannes Schindelin <Johannes.Schindelin@xxxxxx>, Christian Couder <christian.couder@xxxxxxxxx>, René Scharfe <l.s.r@xxxxxx>, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>, Elijah Newren <newren@xxxxxxxxx>, Johannes Sixt <j6t@xxxxxxxx>, Josh Steadmon <steadmon@xxxxxxxxxx>, Emily Shaffer <emilyshaffer@xxxxxxxxxx>
In-reply-to: <d7b51da94e65db79aa59ca331e178741d3c50bc2.1644698093.git.gitgitgadget@gmail.com> (Elijah Newren via GitGitGadget's message of "Sat, 12 Feb 2022 20:34:45 +0000")
References: <pull.1122.v3.git.1643787281.gitgitgadget@gmail.com> <pull.1122.v4.git.1644698093.gitgitgadget@gmail.com> <d7b51da94e65db79aa59ca331e178741d3c50bc2.1644698093.git.gitgitgadget@gmail.com>
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux)

"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:

> +<branch1>.  The result of this second form is is similar to what

I haven't read the rest of the patches, but this like somehow stood
out in the interdiff.

Follow-Ups:
- Re: [PATCH v4 04/12] merge-tree: implement real merges
  - From: Elijah Newren

References:
- [PATCH v3 00/15] In-core git merge-tree ("Server side merges")
  - From: Elijah Newren via GitGitGadget
- [PATCH v4 00/12] In-core git merge-tree ("Server side merges")
  - From: Elijah Newren via GitGitGadget
- [PATCH v4 04/12] merge-tree: implement real merges
  - From: Elijah Newren via GitGitGadget

Prev by Date: [PATCH] dir: force untracked cache with core.untrackedCache
Next by Date: Re: [PATCH 5/7] sparse-checkout: reject non-cone-mode patterns starting with a '#'
Previous by thread: [PATCH v4 04/12] merge-tree: implement real merges
Next by thread: Re: [PATCH v4 04/12] merge-tree: implement real merges
Index(es):
- Date
- Thread

[Index of Archives] [Linux Kernel Development] [Gcc Help] [IETF Annouce] [DCCP] [Netdev] [Networking] [Security] [V4L] [Bugtraq] [Yosemite] [MIPS Linux] [ARM Linux] [Linux Security] [Linux RAID] [Linux SCSI] [Fedora Users]