Skip to content

Agile/scrum user-story fix. #1242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Agile/scrum user-story fix. #1242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions book/03-git-branching/sections/basic-branching-and-merging.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down