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

如何退出git pull合并需要编辑的vim界面 #54

Closed
5663015 opened this issue Dec 8, 2016 · 5 comments
Closed

如何退出git pull合并需要编辑的vim界面 #54

5663015 opened this issue Dec 8, 2016 · 5 comments

Comments

@5663015
Copy link

5663015 commented Dec 8, 2016 •
edited
Loading

输入git pull时出现下面情况：
image

输入git add * git commit -m"" git push origin master 这几个命令时出现下面情况：
image
@5663015 5663015 closed this as completed Dec 8, 2016
@5663015 5663015 reopened this Dec 8, 2016
@PENGZhaoqing
Copy link
Owner

PENGZhaoqing commented Dec 8, 2016 •
edited
Loading

因为远程端修改了，然后你本地端也改了，两者有冲突，现在你git pull拉下来有冲突（强行合并），需要你编辑一下合并的理由和修改的内容，这个界面是linux的vi编辑器

按ECS回到非输入状态，输入:wq回车退出

@PENGZhaoqing PENGZhaoqing changed the title 我是组长，不知为什么无法在C9与我的github互动了 如何退出git pull合并需要编辑vim界面 Dec 8, 2016
@PENGZhaoqing PENGZhaoqing changed the title 如何退出git pull合并需要编辑vim界面 如何退出git pull合并需要编辑的vim界面 Dec 8, 2016
@5663015
Copy link
Author

5663015 commented Dec 9, 2016

我按ESC退出不了啊，没有反应，缺少什么东西吗？

@5663015
Copy link
Author

5663015 commented Dec 9, 2016

还有就是，我的组员几乎同时向我提交了pull requests，会有冲突吗

@PENGZhaoqing
Copy link
Owner

基本上不会同时，就算是同时点击，请求之间因为网络状态也会相差1ms甚至更多，所以还是有个处理的顺序的

@PENGZhaoqing
Copy link
Owner

PENGZhaoqing commented Dec 9, 2016 •
edited
Loading

按ECS回到非输入状态，这个时候你是无法输入的，然后Shift+冒号输入:，你就会看到有输入框，你继续打入wq回车退出

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@5663015 @PENGZhaoqing