guobao2333 / mt-syntax-highlight Goto Github PK
View Code? Open in Web Editor NEW适用于MT管理器的语法高亮 | Syntax-HighLight for MT manager
License: Apache License 2.0
适用于MT管理器的语法高亮 | Syntax-HighLight for MT manager
License: Apache License 2.0
起因:在拉取代码到本地时,因为git merge --continue
提示 fatal: There is no merge in progress (MERGE_HEAD missing).
我很诧异,然后尝试使用git push
提交导致所有合并的代码(除了 #1 之外还有部分本地提交内容)被重新提交了一遍……
这里我应该再次合并而不是直接push,然后我使用git reset
回退了提交,并覆盖了提交历史。
因为这事我还花了几个小时来修复,目前还没搞定😑所以我可能还需要一些时间来解决,如果解决了我将会关闭此问题。
@danicaStarR 你可能需要重新打开拉取请求,或者还有什么别的办法吗?
实话说这是我第一次合并,不太会用,之前我都是直接推送代码😨
大意了,没有闪。
#1 合并的preview/README.md的vimscript预览图链接指向了gitignore
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.