[Pkg-sssd-devel] uid-wrapper git merge vs ftp import

[Timo Aaltonen]

Simon Josefsson kirjoitti 18.8.2023 klo 15.37:
> Hi Timo,
> 
> Maybe the request below got lost among all other emails, but (if you
> agree) could you do this:
> 
> 1) Visit https://salsa.debian.org/sssd-team/uid-wrapper and go to
> Settings->Repository->Protected branches and allow force-push for master
> 
> 2) Run the following, in your clone of the uid-wrapper repository:
> 
> jas at kaka:~/dpkg/uid-wrapper$ git checkout new-master
> jas at kaka:~/dpkg/uid-wrapper$ git branch -d master
> jas at kaka:~/dpkg/uid-wrapper$ git checkout -b master
> jas at kaka:~/dpkg/uid-wrapper$ git push origin master -f
> 
> 3) Disable force-push for master again.
> 
> This will drop my bad tarball import of upstream from the master branch.
> I've been uploading releases from 'new-master' for a while now, and
> 'master' is abandonded.
> 
> /Simon

Took a while but done now.

-- 
t