[Piuparts-devel] welcome buster!

[Andreas Beckmann]

On 2017-06-22 16:15, Holger Levsen wrote:
> 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… 

git revert -m1 HEAD

(that will keep the information that master was merged into develop,
which is all we need for the future)


Andreas