Skip to content
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

Jump to bottom

Fix: #issues464 3.2章中暂存->贮藏 #475

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Fix: #issues464 3.2章中暂存->贮藏 #475

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 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 @@ -65,7 +65,7 @@ image::images/basic-branching-3.png[`iss53` 分支随着工作的进展向前推
但是，在你这么做之前，要留意你的工作目录和暂存区里那些还没有被提交的修改，
它可能会和你即将检出的分支产生冲突从而阻止 Git 切换到该分支。
最好的方法是，在你切换分支之前，保持好一个干净的状态。
有一些方法可以绕过这个问题（即，暂存（stashing） 和 修补提交（commit amending）），
有一些方法可以绕过这个问题（即，贮藏（stashing） 和 修补提交（commit amending）），
我们会在 <<ch07-git-tools#_git_stashing>> 中看到关于这两个命令的介绍。
现在，我们假设你已经把你的修改全部提交了，这时你可以切换回 `master` 分支了：

Expand Down
Loading