[Insight-developers] A HUGE ITKv4 change review request

[Matt McCormick]

On Thu, Jul 14, 2011 at 12:03 PM, Bill Lorensen <bill.lorensen at gmail.com>wrote:

> Hans,
>
> I recently merged some Philips IO classes that had been in Review.
> They now reside in IO/PhilipsREC. You may want to try a merge with
> master. Supposedly, git will be smart enough to handle this.
>

If there are no conflicts, then nothing is necessary.  But, if there are
conflicts, a 'rebase' would be better than a 'merge'.

To do this, checkout the feature branch, and

 git rebase -i origin/master

Matt


>
> Bill
>
> On Thu, Jul 14, 2011 at 11:27 AM, Johnson, Hans J
> <hans-johnson at uiowa.edu> wrote:
> > The series of style changes to ITKv4 that have been discussed several
> times
> > since April have been implemented in a series of patches that end in:
> >  http://review.source.kitware.com/#change,2074
> > I am requesting that you please take this opportunity to review these
> > changes quickly so that we can minimize the effect on diverging code
> streams
> > from master.
> > Thanks,
> > Hans
> >
> >
> > ________________________________
> > Notice: This UI Health Care e-mail (including attachments) is covered by
> the
> > Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is
> confidential
> > and may be legally privileged.  If you are not the intended recipient,
> you
> > are hereby notified that any retention, dissemination, distribution, or
> > copying of this communication is strictly prohibited.  Please reply to
> the
> > sender that you have received the message in error, then delete it.
> Thank
> > you.
> > ________________________________
> > _______________________________________________
> > Powered by www.kitware.com
> >
> > Visit other Kitware open-source projects at
> > http://www.kitware.com/opensource/opensource.html
> >
> > Kitware offers ITK Training Courses, for more information visit:
> > http://kitware.com/products/protraining.html
> >
> > Please keep messages on-topic and check the ITK FAQ at:
> > http://www.itk.org/Wiki/ITK_FAQ
> >
> > Follow this link to subscribe/unsubscribe:
> > http://www.itk.org/mailman/listinfo/insight-developers
> >
> >
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at
> http://www.kitware.com/opensource/opensource.html
>
> Kitware offers ITK Training Courses, for more information visit:
> http://kitware.com/products/protraining.html
>
> Please keep messages on-topic and check the ITK FAQ at:
> http://www.itk.org/Wiki/ITK_FAQ
>
> Follow this link to subscribe/unsubscribe:
> http://www.itk.org/mailman/listinfo/insight-developers
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110714/c8efefe5/attachment.htm>