<HTML>
<HEAD>
<TITLE>Re: [Paraview-developers] Testing a merge</TITLE>
</HEAD>
<BODY>
<FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'><BR>
A more difficult question:<BR>
<BR>
I’ve now tested the merge on a local test branch. When I do so, it attempts to write to Qt/Testing.<BR>
<BR>
CONFLICT (file/directory): There is a directory with name Qt/Testing in AMRContourComm. Adding Qt/Testing as Qt/Testing~HEAD<BR>
<BR>
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”<BR>
<BR>
Does this sound right?<BR>
<BR>
Thanks,<BR>
Nathan.<BR>
<BR>
On 2/14/11 11:23 AM, "Nathan Fabian" <<a href="ndfabia@sandia.gov">ndfabia@sandia.gov</a>> wrote:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'><BR>
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.<BR>
<BR>
I was not thinking “branchy” enough and what you say sounds much more sane.<BR>
<BR>
On 2/14/11 11:18 AM, "Utkarsh Ayachit" <<a href="utkarsh.ayachit@kitware.com">utkarsh.ayachit@kitware.com</a>> wrote:<BR>
<BR>
</SPAN></FONT><BLOCKQUOTE><FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'>Not sure I follow what you suggest exactly esp when you say "rebase<BR>
it back out". But if you simply want to test locally the results after<BR>
a merge with git-master you should simply do the following:<BR>
<BR>
* create a new branch rooted off your topic branch<BR>
> git checkout -b testing-branch<BR>
<BR>
* merge origin master<BR>
> git fetch origin<BR>
> git merge origin/master<BR>
<BR>
* do your testing<BR>
* once done, you simply go back to your old branch and stage-push<BR>
stage-merge it.<BR>
<BR>
Utkarsh<BR>
<BR>
On Mon, Feb 14, 2011 at 12:20 PM, Fabian, Nathan <<a href="ndfabia@sandia.gov">ndfabia@sandia.gov</a>> wrote:<BR>
> Hi,<BR>
><BR>
> I have a topic branch I'd like to merge in, but I want to see how it's going<BR>
> to merge in without necessarily doing a stage-merge. If I pull my local<BR>
> master and merge there then rebase it back out, is that equivalent?<BR>
><BR>
> Thanks,<BR>
> Nathan.<BR>
><BR>
><BR>
> _______________________________________________<BR>
> Paraview-developers mailing list<BR>
> <a href="Paraview-developers@paraview.org">Paraview-developers@paraview.org</a><BR>
> <a href="http://public.kitware.com/mailman/listinfo/paraview-developers">http://public.kitware.com/mailman/listinfo/paraview-developers</a><BR>
><BR>
<BR>
<BR>
</SPAN></FONT></BLOCKQUOTE><FONT FACE="Calibri, Verdana, Helvetica, Arial"><SPAN STYLE='font-size:11pt'><BR>
</SPAN></FONT></BLOCKQUOTE>
</BODY>
</HTML>