On Sun, 20 Mar 2011 00:06:01 -0400, "R. David Murray" <rdmur...@bitdance.com> wrote: > It would have been nice if rebase had refused to run given that > there were merges, since it clearly doesn't work in that case.
To clarify, that should have read "given that there were merges *between branches*". Cleaning merges on the same branch is the goal of rebase, after all :) -- R. David Murray http://www.bitdance.com _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
