[vtk-developers] gitlab-push woes
utkarsh.ayachit at kitware.com
Fri Mar 20 15:57:06 EDT 2015
Not really. Whenever you amend a topic, or rebase a topic, or rewrite
the history of a topic in any way, by default, git doesn't let you
push that topic to a remote to avoid accidentally overwriting some
other changes that have been published previously. Gerrit simply
ignored that and let you overwrite things on the remote. We opted to
leave the default Git behavior and let the user explicitly state
his/her intention by using "-f" when rewriting history on a remote.
On Fri, Mar 20, 2015 at 3:45 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
> Did I do something wrong that caused that?
> On Fri, Mar 20, 2015 at 12:34 PM, Utkarsh Ayachit
> <utkarsh.ayachit at kitware.com> wrote:
>> Check the end of the message, it says the following:
>> Add "-f" or "--force" to push a rewritten topic.
>> Hence, the following will do the trick:
>> > git gitlab-push -f
>> On Fri, Mar 20, 2015 at 2:45 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>>> I tried to git gitlab-push a topic that already exist. Here is what I get:
>>> git gitlab-push
>>> Fetching gitlab master
>>> Fetching origin master
>>> Pushing to gitlab
>>> error: failed to push some refs to 'git at gitlab.kitware.com:lorensen/vtk.git'
>>> To prevent you from losing history, non-fast-forward updates were rejected
>>> Merge the remote changes (e.g. 'git pull') before pushing again. See the
>>> 'Note about fast-forwards' section of 'git push --help' for details.
>>> To git at gitlab.kitware.com:lorensen/vtk.git
>>> = 2dfab6b65cd007c67932f6923c4e3cdeb3484b3b:refs/heads/master [up to date]
>>> ! HEAD:refs/heads/UpdateRIB [rejected] (non-fast-forward)
>>> Add "-f" or "--force" to push a rewritten topic.
>>> Unpaid intern in BillsBasement at noware dot com
>>> Powered by www.kitware.com
>>> Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html
>>> Search the list archives at: http://markmail.org/search/?q=vtk-developers
>>> Follow this link to subscribe/unsubscribe:
> Unpaid intern in BillsBasement at noware dot com
More information about the vtk-developers