Wireshark-dev: Re: [Wireshark-dev] Push failed after amend (Change 27518)
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Ahmad Fatoum <ahmad@xxxxxx>
Date: Mon, 11 Jun 2018 09:32:48 +0200
> On 11Jun 2018, at 09:28, david_aggeler@xxxxxxxxxx wrote:
>  
> ==
> remote: Processing changes: refs: 1, done
> To ssh://code.wireshark.org:29418/wireshark
> ! [remote rejected]       HEAD -> refs/publish/master/dicom-heuristic (duplicate request)
> error: failed to push some refs to 'ssh://david-aggeler@xxxxxxxxxxxxxxxxxx:29418/wireshark'
> Done
> ==

git push --force-with-lease

--force works as well, but --force-with-lease is good habit (you can't override someone else's changes by mistake that way).

Cheers
Ahmad