10 Matching Annotations
- Jun 2025
-
www.inkandswitch.com www.inkandswitch.com
-
Edit Groups
Virtual branches and changesets
-
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
-
-
www.inkandswitch.com www.inkandswitch.com
-
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
-
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
-
- Dec 2022
-
forgefed.org forgefed.org
Tags
Annotators
URL
-
-
forgefed.org forgefed.org
Tags
Annotators
URL
-
-
forgefed.org forgefed.org
Tags
Annotators
URL
-
-
forgefed.org forgefed.orgForgeFed1
-
- Nov 2021
-
-
How will you sustain the virtue of your product?
-
- Nov 2019
-
-