Re: [PATCH v2 6/9] merge-recursive: fix assumption that head tree being merged is HEAD

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

Subject: Re: [PATCH v2 6/9] merge-recursive: fix assumption that head tree being merged is HEAD
From: Junio C Hamano <gitster@xxxxxxxxx>
Date: Tue, 03 Jul 2018 12:57:45 -0700
Cc: git@xxxxxxxxxxxxxxx, pclouds@xxxxxxxxx
In-reply-to: <20180701012503.14382-7-newren@gmail.com> (Elijah Newren's message of "Sat, 30 Jun 2018 18:25:00 -0700")
References: <20180603065810.23841-1-newren@gmail.com> <20180701012503.14382-1-newren@gmail.com> <20180701012503.14382-7-newren@gmail.com>
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux)

Elijah Newren <newren@xxxxxxxxx> writes:

> `git merge-recursive` does a three-way merge between user-specified trees
> base, head, and remote.  Since the user is allowed to specify head, we can
> not necesarily assume that head == HEAD.

Makes sense.

References:
- [RFC PATCH 0/7] merge requirement: index matches head
  - From: Elijah Newren
- [PATCH v2 0/9] Fix merge issues with index not matching HEAD
  - From: Elijah Newren
- [PATCH v2 6/9] merge-recursive: fix assumption that head tree being merged is HEAD
  - From: Elijah Newren

Prev by Date: Re: [PATCH v2 2/9] index_has_changes(): avoid assuming operating on the_index
Next by Date: Re: [PATCH v2 8/9] merge-recursive: enforce rule that index matches head before merging
Previous by thread: [PATCH v2 6/9] merge-recursive: fix assumption that head tree being merged is HEAD
Next by thread: [PATCH v2 7/9] t6044: add more testcases with staged changes before a merge is invoked
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]

Powered by Linux