[vtk-developers] Gerrit conflicts

[Marcus D. Hanwell]

On Thu, Oct 14, 2010 at 2:35 PM, Bill Lorensen <bill.lorensen at gmail.com>wrote:

> Marcus,
>
> Here is the situation:
>
> 1) I want to review your change:
> http://review.source.kitware.com/#change,129
> 2) I have an up-to-date version of VTK
>

I would use the checkout option in Gerrit, in your VTK repository,

git fetch http://review.source.kitware.com/p/VTK refs/changes/29/129/4 &&
git checkout FETCH_HEAD

This will put you in a detached head with exactly what I had at the time. I
have now merged this change, and a small fix after you spotted the error. If
you want to turn it into a topic branch after you fetched it, simply,

git checkout -b UsefulSetupScripts

This should allow you to review the changes as they were, without trying to
merge it into the current master.

Marcus
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20101014/9659825d/attachment.html>