[Paraview-developers] [vtk-developers] git stupid question #4

[Biddiscombe, John A.]

Denis, Mark

Thanks to both of you for the tips and tricks
 
> You do not have to switch to master, simply run
>   git pull kitware master
> from your cscs-pv branch.

OK. That was a disaster. it did an auto merge onto the cscs-pv branch and screwed up everything with conflicts. 

did you mean 
git "fetch" kitware master 

if so, then fine. I am rapidly learning stuff and have everything stable now. It's nice the way you can trash a branch, reset it, re check it out and pull from anywhere. 

Cheers

JB