[Paraview-developers] git process

[Utkarsh Ayachit]

Burlen,

I'd undo the last two steps i.e. add VTK to paraview and rebase paraview.

Then, assuming you don't have any other commits changing VTK in your
Paraview topic, you can rebase paraview and the create the new commit
to update the VTK.

You're getting the conflict since VTK has been modified in
origin/master as well as your new commit created by step #4.

Utkarsh

On Fri, Mar 2, 2012 at 11:30 AM, burlen <burlen.loring at gmail.com> wrote:
> Hi,
>
> I made some changes to the Memory Inspector in ParaView so that it reports
> the per process usage and would like to follow the git work flow to submit
> them. I am confused about how I should handle the changes inside VTK. I did
> read the wiki on this, but it's a little light on the details given my level
> of git experience.
>
> here is what I did that didn't work,
>
> made a topic branch in ParaView, modified files, added files, commit
> made a topic branch in VTK, modified files, added files, commit
> switch to VTK master, pull , switch to my vtk topic, rebase master
> switch to PV topic, add VTK, commit
> switch to PV master, pull, switch to my pv topic, rebase master
>
> the last step failed with the following message:
>
> Auto-merging VTK
> CONFLICT (submodule): Merge conflict in VTK
> Failed to merge in the changes.
>
> I think my mistake was to pull and rebase vtk master? Any advise on cleaning
> it up? In my PV topic do I add VTK or is that already handled by actions on
> my vtk topic branch?
>
> Thanks
> Burlen
>
>
>
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers