Giter Site home page Giter Site logo

Comments (5)

PENGZhaoqing avatar PENGZhaoqing commented on September 4, 2024

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

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

from courseselect.

5663015 avatar 5663015 commented on September 4, 2024

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

from courseselect.

5663015 avatar 5663015 commented on September 4, 2024

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

from courseselect.

PENGZhaoqing avatar PENGZhaoqing commented on September 4, 2024

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

from courseselect.

PENGZhaoqing avatar PENGZhaoqing commented on September 4, 2024

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

from courseselect.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.