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

Re: upstream source with debian directory

If you weren't using git I would say use dpkg-source v3 which removes
any upstream debian/ dir during the unpack process.

With git I'm not sure but I'd be inclined to just resolve conflicts,
continue the merge and maybe send upstream some patches. Now that
upstream is also using git you can probably just switch from
git-import-orig to git pull and pristine-tar.



Reply to: