Issue sorted now, thanks to Ben Copeland.

Thomas

Den 2020-06-09 kl. 08:51, skrev Thomas Törnblom via TF-M:

Still having this issue:

PS C:\Users\thomasto\Projects\tf-m1\trusted-firmware-m> git push ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git HEAD:refs/for/master Enumerating objects: 208, done. Counting objects: 100% (207/207), done. Delta compression using up to 4 threads Compressing objects: 100% (131/131), done. Writing objects: 100% (135/135), 16.94 KiB | 1.06 MiB/s, done. Total 135 (delta 97), reused 0 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (97/97) remote: Processing changes: refs: 1, done To ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git  ! [remote rejected]   HEAD -> refs/for/master (I00fb896d2005eb9e64e5a6869e3d6e1d814d43a7 has duplicates) error: failed to push some refs to 'ssh://review.trustedfirmware.org/TF-M/trusted-firmware-m.git'

---

Any ideas how to resolve?

I guess starting out with a fresh local repo would work, but I have 11 patches waiting to be reviewed and merged.

A handful of them appears to be duplicated, and I abandoned those that appeared to be old and had merge conflicts. Unfortunately a majority of those had already been reviewed and the new ones aren't. The new ones has also lost their reviewers

So now I'm stuck and I can't update or create new patches.

Thomas

*Thomas Törnblom*, /Product Engineer/ IAR Systems AB Box 23051, Strandbodgatan 1 SE-750 23 Uppsala, SWEDEN Mobile: +46 76 180 17 80 Fax: +46 18 16 78 01 E-mail: thomas.tornblom@iar.com mailto:thomas.tornblom@iar.com Website: www.iar.com http://www.iar.com Twitter: www.twitter.com/iarsystems http://www.twitter.com/iarsystems