[vtk-developers] git stupid question #4

[Denis Barbier]

On 2010/4/30 Biddiscombe, John A. wrote:
>> 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?

You do not have to switch to master, simply run
  git pull kitware master
from your cscs-pv branch.

Denis