I would suggest create a new branch, though. You can create a new branch
from the old one, then make your changes there. That way if you mess up
something you still have the original to fall back on.
On Thu, Jul 31, 2014 at 5:15 PM, Thomas Caswell <tcasw...@gmail.com> wrote:
> Git lets you re-write history pretty extensively. If you use a tool
> on top of git (I use magit in emacs) you can selectively commit hunks
> one or two at a time. At a minimum split it up by file. You are
> going to have to do some force-pushing anyway.
>
> Making the PRs as small as reasonable makes reviewing much easier. It
> makes it possible to go through the entire PR in one sitting and it
> allows the un-controversial stuff to be merged as quickly as possible
> without being held up by other parts. The longer large PRs hang
> around the greater the chance they will accumulate conflicts with
> other PRs and require a re-base (re-basing a 500+ line diff is
> _incredibly_ painful).
>
> Tom
>
> On Thu, Jul 31, 2014 at 11:09 AM, jamesramm <jamessr...@gmail.com> wrote:
> > Thomas Caswell wrote
> >> I only took a brief look at that branch, but two comments
> >>
> >> 1) can you clean up your git history, you are adding 20k new lines (of
> >> mostly freetype and random files that should not be tracked)
> >> 2) can you split the propertify work up into chunks that are easier to
> >> review?
> >
> > Yes. This is mostly my inability to use git (I've not particular used it
> > before). I'll have to look up how to clean the history and 'unversion'
> the
> > unneeded freetype stuff.
> >
> > As it is already committed to my branch, im not sure the existing stuff
> can
> > be split into chunks? But I will make issues and split up the next lumps
> of
> > work.
> >
> > I'll post back when it is (hopefully) cleaner
> >
> >
> >
> > --
> > View this message in context:
> http://matplotlib.1069221.n5.nabble.com/MEP13-python-containers-tp40248p43732.html
> > Sent from the matplotlib - devel mailing list archive at Nabble.com.
> >
> >
> ------------------------------------------------------------------------------
> > Infragistics Professional
> > Build stunning WinForms apps today!
> > Reboot your WinForms applications with our WinForms controls.
> > Build a bridge from your legacy apps to the future.
> >
> http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
> > _______________________________________________
> > Matplotlib-devel mailing list
> > Matplotlib-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
>
>
>
> --
> Thomas Caswell
> tcasw...@gmail.com
>
>
> ------------------------------------------------------------------------------
> Infragistics Professional
> Build stunning WinForms apps today!
> Reboot your WinForms applications with our WinForms controls.
> Build a bridge from your legacy apps to the future.
>
> http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
> _______________________________________________
> Matplotlib-devel mailing list
> Matplotlib-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
>
------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls.
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
