<html><head><style data-externalstyle="true">
p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
margin-top:0in;
margin-right:0in;
margin-bottom:0in;
margin-left:.5in;
margin-bottom:.0001pt;
}
p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphCxSpFirst, p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagraphCxSpMiddle, p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxSpLast {
margin-top:0in;
margin-right:0in;
margin-bottom:0in;
margin-left:.5in;
margin-bottom:.0001pt;
line-height:115%;
}
</style></head><body><div data-externalstyle="false" style="font-family:Calibri,'Segoe UI',Meiryo,'Microsoft YaHei UI','Microsoft JhengHei UI','Malgun Gothic','Khmer UI','Nirmala UI',Tunga,'Lao UI',Ebrima,sans-serif;font-size:16px;"><div>Also, it’s easy enough to abandon a gerrit change, and then rebase, and push a new gerrit change.</div><div> </div><div>In the case where rebasing is really necessary (because of syncing with data, for example), this is preferable to rebasing and re-pushing the same gerrit change id, because in that case, the diffs view in gerrit gets confused about what’s really part of the change when comparing across the rebase.</div><div> </div><div data-signatureblock="true"> </div> <div style="border-top-color: rgb(225, 225, 225); border-top-width: 1px; border-top-style: solid;"> <strong>From:</strong> Bill Lorensen<br> <strong>Sent:</strong> March 6, 2013 6:05 PM<br> <strong>To:</strong> Marcus D. Hanwell<br> <strong>CC:</strong> David Gobbi; VTK Developers; David Cole; Berk Geveci<br> <strong>Subject:</strong> Re: [vtk-developers] Adding VTKData and VTKLargeData as optional submodules<br> </div> <div> </div>I always rebase to master before I push to gerrit.<div><br></div><div>Joust my process...<span></span><br><br>On Wednesday, March 6, 2013, Marcus D. Hanwell wrote:<br><blockquote class=" gmail_quote" style="margin: 0px 0px 0px 0.8ex; padding-left: 1ex; border-left-color: rgb(204, 204, 204); border-left-width: 1px; border-left-style: solid;">
On Wed, Mar 6, 2013 at 5:50 PM, David Gobbi <<a tabindex="-1">david.gobbi@gmail.com</a>> wrote:<br>
> Can the gerrit dashboards do a temporary merge of the topic into the<br>
> current master, instead of just checking out the topic branch?<br>
><br>
That probably wouldn't be too hard to add in, if there is a merge<br>
conflict it should probably report this too. We can give that a try<br>
and see how it works out. I think it would be preferable to asking<br>
people to rebase (in my opinion at least).<br>
<br>
Marcus<br>
_______________________________________________<br>
Powered by <a tabindex="-1" href="http://www.kitware.com" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a tabindex="-1" href="http://www.kitware.com/opensource/opensource.html" target="_blank">http://www.kitware.com/opensource/opensource.html</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a tabindex="-1" href="http://www.vtk.org/mailman/listinfo/vtk-developers" target="_blank">http://www.vtk.org/mailman/listinfo/vtk-developers</a><br>
<br>
</blockquote></div><br><br>-- <br>Unpaid intern in BillsBasement at noware dot com<br><br>
</div></body></html>