mv "what to avoid" up - it is a good page

coderefinery · Aug 25, 2023 · f9c345b · f9c345b
1 parent 50c9091
commit f9c345b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/content/index.rst b/content/index.rst
@@ -48,6 +48,7 @@ branching.
    remotes
    archaeology
    level
+   what-to-avoid
 
 
 .. toctree::
@@ -67,7 +68,6 @@ branching.
 
    reference
    customizing
-   what-to-avoid
    resources
    exercises
    guide

diff --git a/content/what-to-avoid.md b/content/what-to-avoid.md
@@ -11,9 +11,9 @@ also easier to combine too small commits than it is to split too large commits.
 The longer you wait because of this, the harder it will be to
 commit it at all.
 
-**Not pulling/rebasing before doing new work**: Few things are worse
+**Not updating your branch before starting new work**: Few things are worse
 than doing work and then noticing a lot of conflicts because
-un-related work was done in the meantime..  Or noticing that someone
+un-related work was done in the meantime or even before you started.  Or noticing that someone
 else has already done it.  This problem is largest when you come back
 to an active project weeks or months later.