Re: [PATCH 1/3] builtin/fetch.c: Add pretty_url() and print_url()

On Wed, Dec 18, 2013 at 7:18 PM, Tom Miller wrote: > On Wed, Dec 18, 2013 at 3:47 PM, Junio C Hamano wrote: >> Tom Miller writes: >> >>> In order to fix branchname DF conflicts during `fetch --prune`, the way >>> the header is output to the screen needs to be refactored. Here is an >>> exmaple o

Re: [PATCH/WIP] Repair DF conflicts during fetch.

On Fri, Nov 29, 2013 at 1:07 PM, Thomas Rast wrote: > Tom Miller writes: > >> When a DF conflict occurs during a fetch, --prune should be able to fix >> it. When fetching with --prune, the fetching process happens before >> pruning causing the DF conflict to persist and report an error. This >> p