<div dir="ltr">If I understand correctly, you are trying to re-push a rebased branch. I don't know about Gerrit, but in Git, you can't do that unless you force the push. The problem comes from the rebase (squash) step. You can't modify (as in rewrite) the history of a branch that has been pushed unless you force it (-f). See [1] for more details.<div>
<br></div><div> [1]: <a href="http://stackoverflow.com/questions/8948964/git-rebase-master-then-push-origin-branch-results-in-non-fast-forward-error">http://stackoverflow.com/questions/8948964/git-rebase-master-then-push-origin-branch-results-in-non-fast-forward-error</a></div>
<div><br></div><div style>HTH</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Jun 11, 2013 at 1:51 PM, Sean McBride <span dir="ltr"><<a href="mailto:sean@rogue-research.com" target="_blank">sean@rogue-research.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi all,<br>
<br>
Grrr git. What does this mean:<br>
<br>
$ git gerrit-push<br>
<br>
Fetching gerrit master<br>
Pushing to gerrit<br>
Counting objects: 45, done.<br>
Delta compression using up to 16 threads.<br>
Compressing objects: 100% (22/22), done.<br>
Writing objects: 100% (24/24), 2.23 KiB, done.<br>
Total 24 (delta 19), reused 1 (delta 1)<br>
remote: Resolving deltas: 0% (0/19)<br>
error: failed to push some refs to 'SeanMcBride@review.source.kitware.com:VTK'<br>
To SeanMcBride@review.source.kitware.com:VTK<br>
! HEAD:refs/for/master/Wlogical-not-parentheses [remote rejected] (change 11545 closed)<br>
<br>
I have this guy open:<br>
<br>
<<a href="http://review.source.kitware.com/#/c/11566/" target="_blank">http://review.source.kitware.com/#/c/11566/</a>><br>
<br>
but need to tweak it, so I did another commit on the branch, squashed it, then tried to do gerrit-push... I swear that process has worked before...<br>
<br>
Cheers,<br>
<br>
--<br>
____________________________________________________________<br>
Sean McBride, B. Eng <a href="mailto:sean@rogue-research.com">sean@rogue-research.com</a><br>
Rogue Research <a href="http://www.rogue-research.com" target="_blank">www.rogue-research.com</a><br>
Mac Software Developer Montréal, Québec, Canada<br>
<br>
<br>
_______________________________________________<br>
Powered by <a href="http://www.kitware.com" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" target="_blank">http://www.kitware.com/opensource/opensource.html</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://www.vtk.org/mailman/listinfo/vtk-developers" target="_blank">http://www.vtk.org/mailman/listinfo/vtk-developers</a><br>
<br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Félix C. Morency, M.Sc.<br>Plateforme d’analyse et de visualisation d’images<br>Centre Hospitalier Universitaire de Sherbrooke<br>Centre de recherche clinique Étienne-Le Bel<br>
Local Z5-3031 | 819.346.1110 ext 16634 </div>
</div>