[vtk-developers] RE: Adding VTKData and VTKLargeData as optional submodules

[David Cole]

Also, it’s easy enough to abandon a gerrit change, and then rebase, and push a new gerrit change.

 

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.

 


From: Bill Lorensen
Sent: ‎March‎ ‎6‎, ‎2013 ‎6‎:‎05‎ ‎PM
To: Marcus D. Hanwell
CC: David Gobbi; VTK Developers; David Cole; Berk Geveci
Subject: Re: [vtk-developers] Adding VTKData and VTKLargeData as optional submodules


I always rebase to master before I push to gerrit.



Joust my process...

On Wednesday, March 6, 2013, Marcus D. Hanwell wrote:

On Wed, Mar 6, 2013 at 5:50 PM, David Gobbi <david.gobbi at gmail.com> wrote:
> Can the gerrit dashboards do a temporary merge of the topic into the
> current master, instead of just checking out the topic branch?
>
That probably wouldn't be too hard to add in, if there is a merge
conflict it should probably report this too. We can give that a try
and see how it works out. I think it would be preferable to asking
people to rebase (in my opinion at least).

Marcus
_______________________________________________
Powered by www.kitware.com

Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html

Follow this link to subscribe/unsubscribe:
http://www.vtk.org/mailman/listinfo/vtk-developers




-- 
Unpaid intern in BillsBasement at noware dot com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20130307/1e701faf/attachment.html>