Fossil SCM
Fix a typo in the "branching.wiki" document.
Commit
83d6065c99a06832b6ecfa6f71103276c49471ea
Parent
4d1ef64ee89ba2c…
1 file changed
+1
-1
+1
-1
| --- www/branching.wiki | ||
| +++ www/branching.wiki | ||
| @@ -59,11 +59,11 @@ | ||
| 59 | 59 | as shown in figure 1. This is how CVS works. This is also how fossil |
| 60 | 60 | works in "autosync" mode. |
| 61 | 61 | |
| 62 | 62 | But it might be that Bob is off-network when he does his commit, so he |
| 63 | 63 | has no way of knowing that Alice has already committed her changes. |
| 64 | -Or, it could be that Bob has turned off "autosync" mode in SQLite. Or, | |
| 64 | +Or, it could be that Bob has turned off "autosync" mode in Fossil. Or, | |
| 65 | 65 | maybe Bob just doesn't want to merge in Alice's changes before he has |
| 66 | 66 | saved his own, so he forces the commit to occur using the "--force" option |
| 67 | 67 | to the fossil <b>commit</b> command. For whatever reason, two commits against |
| 68 | 68 | check-in 2 have occurred and now the tree has two leaves. |
| 69 | 69 | |
| 70 | 70 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -59,11 +59,11 @@ | |
| 59 | as shown in figure 1. This is how CVS works. This is also how fossil |
| 60 | works in "autosync" mode. |
| 61 | |
| 62 | But it might be that Bob is off-network when he does his commit, so he |
| 63 | has no way of knowing that Alice has already committed her changes. |
| 64 | Or, it could be that Bob has turned off "autosync" mode in SQLite. Or, |
| 65 | maybe Bob just doesn't want to merge in Alice's changes before he has |
| 66 | saved his own, so he forces the commit to occur using the "--force" option |
| 67 | to the fossil <b>commit</b> command. For whatever reason, two commits against |
| 68 | check-in 2 have occurred and now the tree has two leaves. |
| 69 | |
| 70 |
| --- www/branching.wiki | |
| +++ www/branching.wiki | |
| @@ -59,11 +59,11 @@ | |
| 59 | as shown in figure 1. This is how CVS works. This is also how fossil |
| 60 | works in "autosync" mode. |
| 61 | |
| 62 | But it might be that Bob is off-network when he does his commit, so he |
| 63 | has no way of knowing that Alice has already committed her changes. |
| 64 | Or, it could be that Bob has turned off "autosync" mode in Fossil. Or, |
| 65 | maybe Bob just doesn't want to merge in Alice's changes before he has |
| 66 | saved his own, so he forces the commit to occur using the "--force" option |
| 67 | to the fossil <b>commit</b> command. For whatever reason, two commits against |
| 68 | check-in 2 have occurred and now the tree has two leaves. |
| 69 | |
| 70 |