This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: git pull --rebase problems.


On Wed, Oct 3, 2012 at 4:30 PM, Roland McGrath <roland@hack.frob.com> wrote:
>> >> error: 'refs/remotes/origin/hjl/pr14557' exists; cannot create
>> >> 'refs/remotes/origin/hjl/pr14557/map'
> [...]
>> What causes this to happen?
>>
>> Deleting and recreating remote branches with the same names?
>
> As the error message indicates, there was previously a branch called
> hjl/pr14557.  That translates (sometimes) to a (plain-text) file called
> .git/refs/.../hjl/pr14557 existing.  Now there is a branch called
> hjl/pr14557/map, which translates (sometimes) to a file called
> .git/refs/.../hjl/pr14557/map needing to exist.  That implies that
> a directory called .git/refs/.../hjl/pr14557 needs to be created,
> but there is already a non-directory file by that name.
>

It may happens when you rename a branch.  "git remote prune origin"
removes the old branches.

-- 
H.J.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]