If you're pushing an update to a branch (i.e. a different commit onto the the same branch name) you'll need to force-push. You can do that via "push -f" or by prepending a "+" to the branch name:
$ git push -f downstream HEAD # ...or... $ git push downstream +HEAD On 9/8/20 10:18 AM, Jamie Hare wrote: > Hello, > > I am having some git issues when trying to update my change that I migrated > from Gerrit. It failed the pipeline so I made some changes but I keep getting > errors from git. I've been trying to figure it out for a few days and I am > not sure what the issue is. > > I get > To gitlab.com:jamienhare/wireshark.git > ! [rejected] HEAD -> ippusb-protocol (non-fast-forward) > error: failed to push some refs to 'g...@gitlab.com:jamienhare/wireshark.git' > hint: Updates were rejected because the tip of your current branch is behind > hint: its remote counterpart. Integrate the remote changes (e.g. > hint: 'git pull ...') before pushing again. > hint: See the 'Note about fast-forwards' in 'git push --help' for details. > > but when I try to pull it says that it is up to date. I tried to pull > upstream into my master and then rebase on top of that so I have the newest > changes, and it will say I am 1 commit ahead of upstream and no commits > behind but whenever I try to push it still has this issue. I even tried > resetting all of my changes and starting from where I was 5 days ago and I > was able to push it correctly to see if it was my new changes, but that also > doesn't work. > > Best, > Jamie > > ___________________________________________________________________________ > Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> > Archives: https://www.wireshark.org/lists/wireshark-dev > Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev > mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe > ___________________________________________________________________________ Sent via: Wireshark-dev mailing list <wireshark-dev@wireshark.org> Archives: https://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
