10 Matching Annotations
  1. Jun 2025
    1. Edit Groups

      Virtual branches and changesets

    2. Or perhaps you may start editing and then later realize you want to move your work to a branch.

      Virtual branches, changesets, ad hoc commits

    1. This merging process handles syntactic conflicts in a simplistic way: for example, if “white” is changed to “frosty” in one draft and to “soft” in another draft, the merged result is either “frostysoft” or “softfrosty.” This result requires human follow-up to correct, which should be made obvious through review using tools like “Show Changes.”

      I prefer explicit conflicts

    2. A draft therefore serves a similar purpose to a commit

      So far it seems much more a branch than commit. I guess the messages are persistent and that’s distinguishing

  2. Dec 2022
  3. Nov 2021
  4. Nov 2019