diff --git a/book/03-git-branching/sections/basic-branching-and-merging.asc b/book/03-git-branching/sections/basic-branching-and-merging.asc index dee1d7021..80ec83e19 100644 --- a/book/03-git-branching/sections/basic-branching-and-merging.asc +++ b/book/03-git-branching/sections/basic-branching-and-merging.asc @@ -4,7 +4,7 @@ Let's go through a simple example of branching and merging with a workflow that You'll follow these steps: . Do some work on a website. -. Create a branch for a new story you're working on. +. Create a branch for a new user story you're working on. . Do some work in that branch. At this stage, you'll receive a call that another issue is critical and you need a hotfix. @@ -13,7 +13,7 @@ You'll do the following: . Switch to your production branch. . Create a branch to add the hotfix. . After it's tested, merge the hotfix branch, and push to production. -. Switch back to your original story and continue working. +. Switch back to your original user story and continue working. [[_basic_branching]] ==== Basic Branching