[Paraview-developers] git stupid question #4
Biddiscombe, John A.
biddisco at cscs.ch
Fri Apr 30 02:29:06 EDT 2010
> Subject: Re: [Paraview-developers] strange linker error
>
> Do a submodule update. It should be fixed.
OK. All is well with my build, but
cd VTK
git checkout master
(touches every file which is different)
git pull kitware master
(retrieve a couple of changes)
git checkout cscs-pv
(touches every file which is different + new ones)
git merge master
make
now make rebuilds practically all of VTK again even though only a couple of files were pulled. Imagine if vtkSetGet.h were different on the branches, now we'd really be in trouble!
Is there a way of saying
I'm on branch cscs-pv, please pull on the master branch from kitware, so that I can do a merge in a minute, without swapping my active branch?
Thanks
JB
More information about the Paraview-developers
mailing list