Hi David,
you have have at least 3 different commits with the same Change-ID, which cannot work (as indicated previously).
Please squash them altogether with the git rebase -i command.
BR,
Pascal.
Hi Pascal, Dario,
I did a git rebase -I HEAD~2 (any a few others). That seems to work, but not the subsequent push. I’ve attached a log if that helps.
Regards
David
From: Wireshark-dev [mailto:wireshark-dev-bounces@xxxxxxxxxxxxx] On Behalf Of Pascal Quantin
Sent: Monday, June 11, 2018 9:48 AM
To: Developer support list for Wireshark <wireshark-dev@xxxxxxxxxxxxx>
Subject: Re: [Wireshark-dev] Push failed after amend (Change 27518)
Hi David,
I still have to learn a lot. I’ve got a pending review, so I’ve updated my code, amended as I thought I needed to, and tried to push once more (as I did last time except the last push did not have the author populated).
However I get an error:
==
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
==
Any advice?
That probably means that you have at least two separate commits that use the same Change-Id (while each commit must have a different one). So inspect your history and either squash the commits together or use separate ids for bot h commits (you can edit your commits with git rebase -i).
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
