HI Ian,

>  Branch is managed by git-debrebase ($ffq_prev exists), but quilt mode
>  ($quilt_mode) implies a split view.  That cannot possibly be right.
>
> which I think in your case would come out as
>
>  Branch is managed by git-debrebase (refs/ffq-prev/heads/master
>  exists), but quilt mode (gbp) implies a split view.  That cannot
>  possibly be right.
>
> Suggestions for improvement welcome.

Maybe also add suggestion of how to get rid off
refs/ffq-pref/heads/master? Since the user specified --gbp, it is
reasonably clear what he wants..

Either suggest:
   $ git update-ref -d  refs/ffq-pref/heads/master
   (would it resolve it?)

or the command sequence you proposed earlier:
   $ git branch temp
   $ git debrebase scrap
   $ git reset --hard temp

or what do you think? Maybe it is not necessary. This is most likely
not something that will happen often..

Best regards,
Ruben

Reply via email to