Just do git merge master when checked out to that branch. Aaron Meurer
On Jun 16, 2012, at 2: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. > > -- > 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. > -- 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.
