Skip to content

Repository files navigation

fork-fold maintenance repository

This repository is a fork-fold stack: an upstream base plus an ordered set of live topic branches, assembled into a single branch with tracked conflict resolutions.

  • manifest.toml -- intent: remotes, base, ordered entries.
  • manifest.lock.json -- fact: the OIDs and tree hash of the last build.
  • resolutions/ -- tracked sidecar files replaying each conflicted merge.
  • patches/ -- patch entries (escape hatch for cross-topic semantic fixes).

Common operations:

fork-fold add mine:some-branch   # append a topic
fork-fold build                  # assemble (incremental for appends)
fork-fold status                 # lock vs. manifest vs. live refs

The assembled branch is compiled output. Never develop on it, never merge it back into a topic.

About

GitHub template mirror of fork-fold's templates/maintenance - do not edit here; canonical source is colonelpanic8/fork-fold

Resources

Stars

0 stars

Watchers

0 watching

Forks

Releases

Packages

Contributors

Languages