[Piuparts-devel] welcome buster!

[Holger Levsen]

On Thu, Jun 22, 2017 at 01:59:10PM +0000, Holger Levsen wrote:
> git merge -X theirs master
> did the trick nicely.

not nicely, it seems 823982b overwrote custom-scripts/scripts/pre_distupgrade_zz_database-server 
and debian/changelog with what was in the master branch… or maybe more?

needs more investigation -> not from me today… 


-- 
cheers,
	Holger
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 811 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/piuparts-devel/attachments/20170622/f9132db9/attachment.sig>