[Paraview-developers] PVVTK question
Andy Bauer
andy.bauer at kitware.com
Thu Jul 28 20:09:43 EDT 2011
Hi Nathan,
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.
Andy
On Thu, Jul 28, 2011 at 7:51 PM, Fabian, Nathan <ndfabia at sandia.gov> wrote:
> Hi,
>
> If I'm following the branchy workflow I would do something like:
>
> git checkout –b my_branch origin/master
> Do stuff
> git stage-push
> git stage-merge
>
> Is the equivalent for pvvtk to say:
>
> git checkout –b my_branch pvvtk/master
> Do stuff
> git pvvtk-push
> git pvvtk-merge-next
>
> ?
>
> Thanks,
> Nathan.
>
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20110728/0f7f5a0a/attachment.htm>
More information about the Paraview-developers
mailing list