On Sat, Jun 16, 2012 at 11:59 PM, [email protected] <[email protected]> wrote: > I have a certain big branch rooted somewhere in the ancient history of > the project (maybe a month ago). This old branch needs to use > something that was introduced in a very recent pull request (thus > something that is already in master, but that was not in master when > the branch was started). > > What should I do? A certain type of merge I suppose? Rebase is out of > the question because of the way it will destroy my git history.
This sounds unusual to me. I don't claim to be a Git expert, but in my (rather long, but individualistic) experience, I've seen no situation where rebasing wouldn't be appropriate and merging would, besides when you want to keep you commit hashes intact, of course. Therefore I'd be very interested in knowing why doesn't rebase suit you. Sergiu -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
