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: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Date: Mon, 11 Jun 2018 09:48:16 +0200
Hi David,

Le lun. 11 juin 2018 à 09:29, <david_aggeler@xxxxxxxxxx> a écrit :

 

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).

Best regards,
Pascal.