[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Files-Excluded with DEP-14



Hello,

On Tue 15 Oct 2024 at 09:03am +02, Joachim Zobel wrote:

> Hi.
>
> DEP-14 states under "About repacked upstream sources" that files that
> are removed from repacked sources should not be in the upstream
> branches.
>
> This does however create modify/delete conflicts when upstream modifies
> the removed files. Is there a smart way to handle this?

There are some notes on a few ways to do this in dgit-maint-merge(7) and
dgit-maint-debrebase(7).

-- 
Sean Whitton


Reply to: