[Paraview-developers] Testing a merge

[Fabian, Nathan]

A more difficult question:

I've now tested the merge on a local test branch.  When I do so, it attempts to write to Qt/Testing.

CONFLICT (file/directory): There is a directory with name Qt/Testing in AMRContourComm.  Adding Qt/Testing as Qt/Testing~HEAD

Since Qt/Testing is a submodule what I think I want to do to resolve this is a "git submodule update Qt/Testing" and "git add Qt/Testing"

Does this sound right?

Thanks,
Nathan.

On 2/14/11 11:23 AM, "Nathan Fabian" <ndfabia at sandia.gov> wrote:


When  I thought to merge my topic branch onto my local master, I expected I would want to also rebase back to origin/master in order to remove the test merge.

I was not thinking "branchy" enough and what you say sounds much more sane.

On 2/14/11 11:18 AM, "Utkarsh Ayachit" <utkarsh.ayachit at kitware.com> wrote:

Not sure I follow what you suggest exactly esp  when you say "rebase
it back out". But if you simply want to test locally the results after
a merge with git-master you should simply do the following:

* create a new branch rooted off your topic branch
> git checkout -b testing-branch

* merge origin master
> git fetch origin
> git merge origin/master

* do your testing
* once done, you simply go back to your old branch and stage-push
stage-merge it.

Utkarsh

On Mon, Feb 14, 2011 at 12:20 PM, Fabian, Nathan <ndfabia at sandia.gov> wrote:
> Hi,
>
> I have a topic branch I'd like to merge in, but I want to see how it's going
> to merge in without necessarily doing a stage-merge.  If I pull my local
> master and merge there then rebase it back out, is that equivalent?
>
> Thanks,
> Nathan.
>
>
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers
>



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20110214/6282159a/attachment.htm>