jugglinmike / proposal-conflict-comment Goto Github PK
View Code? Open in Web Editor NEWA proposal to extend the lexical grammar of ECMAScript with Git conflict markers
Home Page: https://jugglinmike.github.io/proposal-conflict-comment/
A proposal to extend the lexical grammar of ECMAScript with Git conflict markers
Home Page: https://jugglinmike.github.io/proposal-conflict-comment/
In your example:
function onRequest() {
<<<<<<< HEAD
var screen = document.querySelector('.screen7');
=======
var screen = document.getElementsByClassName('screen8')[0];
>>>>>>> refactor-overlay
By treating the conflict markers as comments, screen
will silently be set to screen 8, instead of 7 - this could cause a much harder to triage production bug if the wrong screen got updated - perhaps because the logic below (that uses screen
) did not conflict, and assumes screen 7.
It should have runtime semantics that read the mind of the developer to decide which git conflict branch should be used instead of silently ignore them all.
I'd like to see that kind of supernatural feature to be implemented in the engines ๐
the proposal inside README.md is prefixed with a message saying that it's a "joke". surely the repo has been compromised by an outside party.
Seems completely overkill to me. You're asking to modify a language used by millions of people just to support mistakes done by a really really few people which doesn't know how to properly use a tool...
In a real dev environment (company business) this never ever append => tests, ci checking/building code, lint, version control, etc... Moreover, github warns you about this, and of course you create branches and doesn't push on master... So typically, your example should absolutely never append, except for extreme amateurs
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.