From db49e0ecc6bfdee221f681695bd8b2167376257d Mon Sep 17 00:00:00 2001 From: Scott Chacon Date: Fri, 8 Mar 2024 10:23:50 +0100 Subject: [PATCH] a few small typos --- src/branching-merging-and-conflicts/anonymous-branches.md | 2 +- src/sharing-code/named-branches.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/branching-merging-and-conflicts/anonymous-branches.md b/src/branching-merging-and-conflicts/anonymous-branches.md index e3c85b3..9609274 100644 --- a/src/branching-merging-and-conflicts/anonymous-branches.md +++ b/src/branching-merging-and-conflicts/anonymous-branches.md @@ -11,7 +11,7 @@ branches once they get used to things. Let's talk about it. -## What is a branch, conceptualy? +## What is a branch, conceptually? When two changes share the same parent change, we say that they are "branching," because the graph of commits would look like this: diff --git a/src/sharing-code/named-branches.md b/src/sharing-code/named-branches.md index bd52864..34f9cee 100644 --- a/src/sharing-code/named-branches.md +++ b/src/sharing-code/named-branches.md @@ -68,6 +68,4 @@ than as I work. That is, the branch name tends to sit at the same change as the remote server, and when it's time to update the remote, that's when I update things locally. -`jj` will update the branch when changes get - Speaking of remotes, let's talk about that next.