Skip to content

Fix typo #5

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix typo #5

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
2 changes: 1 addition & 1 deletion 03-git-branching/sections/basic-branching-and-merging.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Fast-forward
.`master` 被快进到 `hotfix`
image::../images/basic-branching-5.png[`master` 被快进到 `hotfix`。]

关于这个紧急问题的解决方案发布之后，你准备回到被打断之前时的工作中。
关于这个紧急问题的解决方案发布之后，你准备回到被打断之前的工作中。
然而，你应该先删除 `hotfix` 分支，因为你已经不再需要它了 —— `master` 分支已经指向了同一个位置。
你可以使用带 `-d` 选项的 `git branch` 命令来删除分支：

Expand Down