Re: [PATCH] Clarification for the command "git checkout <branch>"

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

Subject: Re: [PATCH] Clarification for the command "git checkout <branch>"
From: Michael Witten <mfwitten@xxxxxxxxx>
Date: Wed, 17 Mar 2010 13:50:15 -0500
Cc: Markus Elfring <Markus.Elfring@xxxxxx>, Avery Pennarun <apenwarr@xxxxxxxxx>, git@xxxxxxxxxxxxxxx
In-reply-to: <7v8w9qkd5z.fsf@xxxxxxxxxxxxxxxxxxxxxxxx>

On Wed, Mar 17, 2010 at 13:37, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> such local changes may conflict with the change
> made between A and B, and stops the command.

I'm sensing that it needs to be clarified what a conflict is.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Follow-Ups:
- Re: [PATCH] Clarification for the command "git checkout <branch>"
  - From: Junio C Hamano

References:
- Better cooperation between checkouts and stashing
  - From: Markus Elfring
- Re: Better cooperation between checkouts and stashing
  - From: Markus Elfring
- Re: Better cooperation between checkouts and stashing
  - From: Junio C Hamano
- Re: Better cooperation between checkouts and stashing
  - From: Markus Elfring
- Re: Better cooperation between checkouts and stashing
  - From: Michael Witten
- Re: [PATCH] Clarification for the command "git checkout <branch>"
  - From: Markus Elfring
- Re: [PATCH] Clarification for the command "git checkout <branch>"
  - From: Avery Pennarun
- Re: [PATCH] Clarification for the command "git checkout <branch>"
  - From: Junio C Hamano
- Re: [PATCH] Clarification for the command "git checkout <branch>"
  - From: Markus Elfring
- Re: [PATCH] Clarification for the command "git checkout <branch>"
  - From: Junio C Hamano

Prev by Date: [PATCH v4] git checkout -b: unparent the new branch with -o
Next by Date: Re: [PATCH v3] git checkout -b: unparent the new branch with -o
Previous by thread: Re: [PATCH] Clarification for the command "git checkout <branch>"
Next by thread: Re: [PATCH] Clarification for the command "git checkout <branch>"
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]