fossil-stage - for staging commits, following the process I outlined in this forum post
Develop content in one branch, squash it to the main branch
I want to have a
drafts branch where I do my writing.
When I'm ready to publish it, I will copy the final file into trunk.
Then I'll commit in trunk, and merge it to drafts.
Hopefully it doesn't blow up :)
- This seems to work pretty well.
This is the same scenario I documented in this forum post.
I wonder how the proposed fix affects this?
The content is the same, so I would not expect to get a conflict.