[Paraview] Git Pull from "release" branch causes Merge Conflicts?

[Michael Jackson]

I kinda thought that is what was happening but I couldn't figure out  
how to get a "clean" checkout of the "release" branch. Thanks for the  
info. Should I add a short blurb to the Wiki about this?
___________________________________________________________
Mike Jackson                      www.bluequartz.net
Principal Software Engineer       mike.jackson at bluequartz.net
BlueQuartz Software               Dayton, Ohio


On Apr 26, 2010, at 1:23 PM, Utkarsh Ayachit wrote:

> From the man page for git-pull:
>
> "git-pull - Fetch from and merge with another repository or a local  
> branch"
>
> So in effect what you did was you tried to merge the release branch
> into the one you were currently on (probably master).
>
> What I do in such cases is:
>> git fetch origin
>> git checkout -b <local branch name> origin/release
>
>
> Utkarsh
>
>
>
> On Mon, Apr 26, 2010 at 1:14 PM, Michael Jackson
> <mike.jackson at bluequartz.net> wrote:
>> I just tried to pull from the "release" branch and got the  
>> following errors:
>>
>> 532:[mjackson at Ferb:ParaView]$ git pull origin release
>> From git://paraview.org/ParaView
>>  * branch            release    -> FETCH_HEAD
>> Auto-merging Applications/AdaptiveParaView/Plugin/ 
>> vtkRawStridedReader1.cxx
>> CONFLICT (content): Merge conflict in
>> Applications/AdaptiveParaView/Plugin/vtkRawStridedReader1.cxx
>> Auto-merging Applications/AdaptiveParaView/Plugin/ 
>> vtkSMAdaptiveViewProxy.cxx
>> CONFLICT (content): Merge conflict in
>> Applications/AdaptiveParaView/Plugin/vtkSMAdaptiveViewProxy.cxx
>> Auto-merging Plugins/CMakeLists.txt
>> Auto-merging Plugins/Manta/VTK/Testing/MantaBenchmark.cxx
>> CONFLICT (content): Merge conflict in
>> Plugins/Manta/VTK/Testing/MantaBenchmark.cxx
>> Auto-merging Plugins/Manta/VTK/vtkMantaActor.cxx
>> CONFLICT (content): Merge conflict in Plugins/Manta/VTK/ 
>> vtkMantaActor.cxx
>> Auto-merging Plugins/Manta/VTK/vtkMantaActor.h
>> Auto-merging Servers/Executables/CMakeLists.txt
>> Automatic merge failed; fix conflicts and then commit the result.
>>
>>
>> I'll admit up front that I am still coming up the Git learning tree  
>> so I may
>> have done something stupid when checking out the sources..
>>
>>  I also looked on the ParaView Wiki at the Git page but nothing was  
>> there
>> specific to working with the release branch.
>>
>> Thanks for any pointers.
>> ___________________________________________________________
>> Mike Jackson                      www.bluequartz.net
>> Principal Software Engineer       mike.jackson at bluequartz.net
>> BlueQuartz Software               Dayton, Ohio
>>
>>
>> _______________________________________________
>> Powered by www.kitware.com
>>
>> Visit other Kitware open-source projects at
>> http://www.kitware.com/opensource/opensource.html
>>
>> Please keep messages on-topic and check the ParaView Wiki at:
>> http://paraview.org/Wiki/ParaView
>>
>> Follow this link to subscribe/unsubscribe:
>> http://www.paraview.org/mailman/listinfo/paraview
>>