On Jun 16, 2012, at 3:12 PM, Sergiu Ivanov <[email protected]> wrote:
> 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 If you have any kind of upstream (branches that are based on yours, either of your own or especially those of others), you want to avoid rebasing, because if you do they will all have to rebase too or else end up with duplicate commits. Rebasing can also have other issues, like removing almost all of a commit, making it no longer do what the commit message says it does (which can be very confusing to someone looking at the commit later). On the other hand, the only disadvantage of merging only is that you can't fix any mistakes in commit messages, and also it makes the commit history a little harder to look at (which I hardly consider to be a real issue). I guess the other disadvantage of merging is that conflicts are a little harder to resolve, since you have to manage them all at once rather than one commit at a time. But on the flip side, sometimes with rebasing you have to manage conflicts that become irrelevant in later commits, or you have to resolve the same conflict multiple times. Aaron Meurer -- 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.
