Git Product home page Git Product logo

mt-syntax-highlight's People

Contributors

danicastarr avatar guobao2333 avatar

Stargazers

 avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar  avatar

Watchers

 avatar

mt-syntax-highlight's Issues

提交历史因误操作导致合并的拉取请求被覆盖

起因:在拉取代码到本地时,因为git merge --continue提示 fatal: There is no merge in progress (MERGE_HEAD missing). 我很诧异,然后尝试使用git push提交导致所有合并的代码(除了 #1 之外还有部分本地提交内容)被重新提交了一遍……

这里我应该再次合并而不是直接push,然后我使用git reset回退了提交,并覆盖了提交历史。
因为这事我还花了几个小时来修复,目前还没搞定😑所以我可能还需要一些时间来解决,如果解决了我将会关闭此问题。

@danicaStarR 你可能需要重新打开拉取请求,或者还有什么别的办法吗?

实话说这是我第一次合并,不太会用,之前我都是直接推送代码😨

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.