Hi Nathan,<br><br>I think you want to use git pvvtk-merge instead of git pvvtk-merge-next. Note also that nothing will get tested until you commit the new VTK SHA in paraview and do the corresponding push and merge. When doing this you may also have to go through a bunch of merges for other stuff that has been committed to pvvtk. If you do this on a Friday after the paraview gatekeeper meeting this process will be much shorter though.<br>
<br>Andy<br><br><div class="gmail_quote">On Thu, Jul 28, 2011 at 7:51 PM, Fabian, Nathan <span dir="ltr"><<a href="mailto:ndfabia@sandia.gov">ndfabia@sandia.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div style="word-wrap:break-word;color:rgb(0, 0, 0);font-size:14px;font-family:Calibri, sans-serif">
<div>Hi,</div>
<div><br>
</div>
<div>If I'm following the branchy workflow I would do something like:</div>
<div><br>
</div>
<div>git checkout –b my_branch origin/master</div>
<div>Do stuff</div>
<div>git stage-push</div>
<div>git stage-merge</div>
<div><br>
</div>
<div>Is the equivalent for pvvtk to say:</div>
<div><br>
</div>
<div>git checkout –b my_branch pvvtk/master</div>
<div>Do stuff</div>
<div>git pvvtk-push</div>
<div>git pvvtk-merge-next</div>
<div><br>
</div>
<div>?</div>
<div><br>
</div>
<div>Thanks,</div>
<div>Nathan.</div>
</div>
<br>_______________________________________________<br>
Paraview-developers mailing list<br>
<a href="mailto:Paraview-developers@paraview.org">Paraview-developers@paraview.org</a><br>
<a href="http://public.kitware.com/mailman/listinfo/paraview-developers" target="_blank">http://public.kitware.com/mailman/listinfo/paraview-developers</a><br>
<br></blockquote></div><br>