22 Matching Annotations
  1. Feb 2024
    1. Master (master/main) branch. The default production branch in a Git repository that needs to be permanently stable. Developers can merge changes into the master branch only after code review and testing. All collaborators on a project must keep the master branch stable and updated.
  2. Jan 2022
    1. If one of those two expressions couldpossibly generate an error condition or a side effect, this could lead to invalidbehavior. Such is the case for our earlier example

      有什么情况下必须使用 branching 方式,而不能使用 conditional move?

  3. Jun 2021
    1. Air pollution caused by the burning of fossil fuels such as coal and oil was responsible for 8.7m deaths globally in 2018, a staggering one in five of all people who died that year, new research has found.

      This is not climate change, heat related deaths - this is particulate matter (PM2.5) from burning the fuels themselves

  4. May 2021
    1. If you want the project's history to look as though all files have always been in the directory foo/bar, then you need to do a little surgery. Use git filter-branch with the "tree filter" to rewrite the commits so that anywhere foo/bar doesn't exist, it is created and all files are moved to it:
  5. Mar 2021
    1. Sér bi aju na ci caru garab gi.

      Le pagne s'est accroché à la branche.

      sér bi -- loincloth. 🩲

      bi -- the.

      aju v. -- hang on.

      na -- (?).

      ci -- close; at @, in, on, inside, to.

      car+u (car) bi -- twig, branch. 🎋

      garab gi -- tree 🌲, plant 🪴; medicine 💊, remedy.

      gi -- the.

      https://www.youtube.com/watch?v=3WS1Q1LT1ks&t=36s

  6. 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"

  7. Dec 2019
  8. Oct 2019
  9. 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.
  10. Aug 2017