Correct, we never use git merge in Django. We always cherry-pick (backport) at the time of making the initial commit, but since we commit everything to master rather than a stable branch, our situation is a bit different.
On Friday, September 9, 2016 at 8:24:52 AM UTC-4, Daniele Procida wrote: > > On Thu, Sep 1, 2016, Tim Graham <[email protected] <javascript:>> wrote: > > >I'll > >admit that I don't really understand how git merging works but I find > >Django's cherry picking of commits to make backports to be very reliable > in > >terms of making history bisectable. > > Hi Tim. > > We're still trying to work out the right way to do this. > > See < > https://groups.google.com/forum/#!topic/django-cms-developers/0j20E9_5gOA>. > > > As I understand, when a commit is cherry-picked into a different branch, > it acquires a different hash, so there is then no easy way to work out > whether the same code is in both branches (they don't share a commit > history that can be compared). > > This makes it difficult to ensure that things are correctly ported forward > or backwards when required. > > On the other hand, merging (which does preserve hashes/history) is an > all-or-nothing process, so not always suitable. > > I'd love to know a way out of this dilemma. > > Daniele > > -- Message URL: https://groups.google.com/d/msg/django-cms-developers/topic-id/message-id Unsubscribe: send a message to [email protected] --- You received this message because you are subscribed to the Google Groups "django CMS developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web, visit https://groups.google.com/d/msgid/django-cms-developers/dc88c38c-a840-4f98-aab8-48a7e4decc90%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
