From: Alexey Muranov Date: Thu, 26 Jul 2012 16:26:45 GMT Subject: Re: [PATCH 1/3] retain reflogs for deleted refs Message-ID: <10DD3DE0-E554-4BE3-A20B-FDBC73219646@gmail.com> In-Reply-To: On 26 Jul 2012, at 14:47, Nguyen Thai Ngoc Duy wrote: > So we haven't found any way to present both branches "foo" and > "foo/bar" on file system at the same time. How about when we a new > branch introduces such a conflict, we push the new branch directly to > packed-refs? If we need either of them on a separate file, for fast > update for example, then we unpack just one and repack all refs that > conflict with it. Attempting to update two conflict branches in > parallel may impact performance, but I don't think that happens often. > -- > Duy How about simply deprecating "/" in branch name? -Alexey.