Oct. 16, 2010
7:20 p.m.
On Sat, Oct 16, 2010 at 12:56 PM, Joshua Holbrook <josh.holbrook@gmail.com>wrote:
On Sat, Oct 16, 2010 at 10:53 AM, Charles R Harris <charlesr.harris@gmail.com> wrote:
Here. This looks harmless but it makes the history really ugly. We need to get the word out *not* to do things this way.
Chuck
_______________________________________________ NumPy-Discussion mailing list NumPy-Discussion@scipy.org http://mail.scipy.org/mailman/listinfo/numpy-discussion
So: Rebase, not merge?
I'm thinking along those lines, but I'm just a dilettante git user. I tend to merge master to my development branches, merge them back to master, and then push master to github. That probably isn't the recommended way. Rebase would probably have the same effect. Chuck