Wireshark · Wireshark-dev: Re: [Wireshark-dev] Push failed after amend (Change 27518)

[<david_aggeler@xxxxxxxxxx>]

Thanks. 

I now tried --force-with-lease and --force. Neither of them worked.

Regards
David

-----Original Message-----
From: Wireshark-dev [mailto:wireshark-dev-bounces@xxxxxxxxxxxxx] On Behalf Of Ahmad Fatoum
Sent: Monday, June 11, 2018 9:33 AM
To: Developer support list for Wireshark <wireshark-dev@xxxxxxxxxxxxx>
Subject: Re: [Wireshark-dev] Push failed after amend (Change 27518)

> 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


___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe