Hi! On Tue, 15 Oct 2024 at 00:05, Joachim Zobel <[email protected]> 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?
Can you be specific on what conflicts you are getting? What package, what operation? I suspect you have something wrong with the branch structure, perhaps you are trying to remove files in actual upstream branch and not the "upstream import" branch that has only one-way changes.
