Fossil

Check-in [cbca374c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Markdownism fix in a Wiki-formatted doc
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: cbca374c37eb1a501dfc75e5595166339ddff1ddf2a3dafb54aece6128b05ce4
User & Date: wyoung 2019-06-20 11:30:16
Context
2019-06-20
13:32
Added new section, "The Authors' Voice" to www/branching.wiki. Other assorted improvements as well. check-in: 2da10998 user: wyoung tags: trunk
11:30
Markdownism fix in a Wiki-formatted doc check-in: cbca374c user: wyoung tags: trunk
11:10
Added the section "Fixing Forks" to www/branching.wiki, and added an explanatory paragraph about the intentionality of forking. check-in: 2686bad1 user: wyoung tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/branching.wiki.

146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
When multiple leaves are desirable, we call this <i>branching</i>
instead of <i>forking</i>:

<blockquote>
<b>Key Distinction:</b> A branch is a <i>named, intentional</i> fork.
</blockquote>

Forks *may* be intentional, but most of the time, they're accidental.

Figure 4 shows an example of a project where there are two branches, one
for development work and another for testing.

<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
<tr><td align="center">
<img src="branch04.svg"><br>







|







146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
When multiple leaves are desirable, we call this <i>branching</i>
instead of <i>forking</i>:

<blockquote>
<b>Key Distinction:</b> A branch is a <i>named, intentional</i> fork.
</blockquote>

Forks <i>may</i> be intentional, but most of the time, they're accidental.

Figure 4 shows an example of a project where there are two branches, one
for development work and another for testing.

<table border=1 cellpadding=10 hspace=10 vspace=10 align="center">
<tr><td align="center">
<img src="branch04.svg"><br>