This is my third day trying to commit/push a bug fix.
Due to my recent retirement from IBM, my eclipse email address has changed to
beth@xxxxxxxxxx.
Gerrit and git push do not seem happy. History below.
I'm recloning the whole repo from 33,000 feet over Arizona, Texas, and I think Oklahoma now. :)
The git reset stuff, that Greg suggested, I'm sorry, doesn't make sense. I will try to reclone.
This is my third day of trying to check in the fix.
I'm guessing now that the problem is that my email address in my local git config was
tibbitts@xxxxxxxxxx when I committed the file, then i couldn't push, webmaster changed Gerrit credentials to change to
beth@xxxxxxxxxx, credentials/ssh-keys worked ok then, but push still didn't work because, presumably, push and commit were then done from two different emails.
I tried to commit it from another repository i already had cloned, with same (current) email on both the commit and the push, but still got git errors on the push. Thus I'm recloning and retrying.
Sigh.
...Beth