diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2020-01-28 23:34:06 -0500 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2020-01-28 23:34:06 -0500 |
| commit | 34708dfa902afabf4833c25233132e56514915de (patch) | |
| tree | 0f4fd5c2c8d782885c5b821114b060e89fce1dcd /wiki/dev/twigs.md | |
| parent | 9bf334de6a2a17371eae9bcdf342c416332350aa (diff) | |
| parent | 6a7b97b436a5a20c172e6b04bf0caa37d544fde4 (diff) | |
Switch to mkdocs.
Diffstat (limited to 'wiki/dev/twigs.md')
| -rw-r--r-- | wiki/dev/twigs.md | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/wiki/dev/twigs.md b/wiki/dev/twigs.md deleted file mode 100644 index c3c7505..0000000 --- a/wiki/dev/twigs.md +++ /dev/null @@ -1,24 +0,0 @@ -# Branches and Twigs - -## Twigs - -* Relatively short-lived -* Share the commit policy of their parent branch -* Gain little value from global names -* Examples: most “topic branches” are twigs - -## Branches - -* Relatively long-lived -* Correspond to differences in commit policy -* Gain lots of value from global names -* Examples: git-flow 'master', 'develop', &c; hg 'stable' vs 'default'; - release branches - -## Commit policy - -* Decisions like “should every commit pass tests?” and “is rewriting or - deleting a commit acceptable?” are, collectively, the policy of a branch -* Can be very formal or even tool-enforced, or ad-hoc and fluid -* Shared understanding of commit policy helps get everyone's expectations - lined up, easing other SCM-mediated conversations |