[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patchy email
From: |
David Kastrup |
Subject: |
Re: Patchy email |
Date: |
Mon, 09 Sep 2013 10:21:41 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
"Phil Holmes" <address@hidden> writes:
> ----- Original Message -----
> From: "David Kastrup" <address@hidden>
> To: <address@hidden>
> Sent: Monday, September 09, 2013 9:05 AM
> Subject: Re: Patchy email
>
>
>> address@hidden writes:
>>
>>> error: some local refs could not be updated; try running
>>> 'git remote prune origin' to remove any old, conflicting branches
>>
>> Well, yes. Either do that, or look up how to prune just dev/janek. He
>> first created this as a branch, then changed it to a branch directory.
>> "git fetch" is not really happy with that.
>>
>> --
>> David Kastrup
>
>
> As you see, I have had problems running patchy-staging. I had this
> same problem yesterday with my normal development machine, but running
> git remote prune origin' as suggested, fixed it. I can't seem to get
> the same to work on my patchy VM.
Try
git branch -d -r origin/dev/janek
on your patchy VM.
--
David Kastrup