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

从 pull 开始学习 Git 协作 | Git 入门（二） #8

Open
leeduckgo opened this issue May 10, 2020 · 0 comments
Open

从 pull 开始学习 Git 协作 | Git 入门（二） #8

leeduckgo opened this issue May 10, 2020 · 0 comments
Labels
Git 使用规范

Comments

@leeduckgo
Copy link
Member

作者：李大狗

  1. 每次切换分支，当前分支一定要干净（已提交状态）可以查看该分支的状态，nothing to commit,working tree clean,为干净，如果有修改，没有git add或者没有Git commit,那么会报错。

    git status

  2. 当A,B两个人分别创建分支，完成各项功能，其中A修改完提交了，而此时B再提交就会产生冲突，此时要进行更新刚才A的修改，这里不要担心会把你自己的修改覆盖掉：

    git pull origin master
@leeduckgo leeduckgo changed the title Git 入门（二） 从 pull 开始学习 Git 协作 | Git 入门（二） May 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Git 使用规范
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@leeduckgo