44 Matching Annotations
  1. Nov 2020
  2. Sep 2020
  3. Feb 2020
    1. class dict(iterable, **kwarg)

      the positional argument must be an iterable object. Each item in the iterable must itself be an iterable with exactly two objects

  4. Jan 2020
    1. It is difficult to recall a commit that is not pointed at by any ref. The further the user goes from a ref, the harder it will be for them to construct the meaning of a commit. But the further back they go, the less likely it is that someone will have changed history since they last looked5.

      ??

    2. you build your mental model on the truth rather than on hypotheses constructed from evidence gathered while experimenting with the API.

      對git的了解不是建立在使用時的實驗和猜測

    3. The first entry is for data/letter.txt. The content of this file is a in the base, b in the receiver and a in the giver. The content is different in the base and receiver. But it is the same in the base and giver. Git sees that the content was modified by the receiver, but not the giver. The diff entry for data/letter.txt is a modification, not a conflict.
      the content flow before merging in two branches
      • base: 'a' -> receiver: 'a' (receiver is unmodified after base)
      • base: 'a' -> giver: 'b' (receiver is modified after base) ##### the content flow after merging
      • receiver: 'a' -> giver: 'b' (giver is modified after receiver and don't have any conflict)