On Jun 16, 2012, at 3:29 PM, Sergiu Ivanov <[email protected]> wrote:
> On Sun, Jun 17, 2012 at 12:24 AM, Aaron Meurer <[email protected]> wrote: >> 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: >>>> >>>> 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. >>> > [...] >>> Therefore I'd be very interested in knowing why doesn't rebase suit >>> you. >> >> 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. > > Yes, that's right, and I considered the situation when you have your > very own branch. > >> 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). > > That's right; I'd rewrite the commit message then, which isn't much of > a trouble to me. The problem is that with big branches, they can sneak in without warning. You essentially have to review each commit after rebasing to make sure it didn't happen, because git automatically "rebases out" stuff without warning. > >> 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 don't think it's a great issue either. > >> 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. > > Yes, I see. > > Thank you for your explanation! > > I guess I'm some sort of weird rebase fan, that's why my question :-) Well then we picked the right GSoC mentor for you :) > > Sergiu 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.
