2 Matching Annotations
  1. Jul 2020
    1. Added `Array#union` and `Array#difference` instance method.

      It appears that this PR built on (was based on) https://github.com/ruby/ruby/pull/1747/files.

      That seems perfectly reasonably to me in this case. Better than creating 2 completely independent PRs that both modified some of the same lines (requiring/forcing a conflict).

      The only downside is that it arbitrarily chooses one PR to be the parent of the other, when they should more intuitively be thought of as siblings/co-equals.

      I like how both PRs both say that they "This solves partially https://bugs.ruby-lang.org/issues/14097"

  2. Nov 2017
    1. exists as long as the feature is in development

      When the development of a feature takes a long time, it may be useful to continuously merge from develop into the feature branch. This has the following advantages:

      • We can use the new features introduced in develop in the feature branch.
      • We simplify the integration merge of the feature branch into develop that will happen at a later point.