GithubHelp home page GithubHelp logo

jugglinmike / proposal-conflict-comment Goto Github PK

View Code? Open in Web Editor NEW
5.0 4.0 0.0 51 KB

A proposal to extend the lexical grammar of ECMAScript with Git conflict markers

Home Page: https://jugglinmike.github.io/proposal-conflict-comment/

Shell 5.14% JavaScript 94.86%

proposal-conflict-comment's Issues

This syntax error is protecting against a logic error

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.

Runtime semantics

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 ๐ŸŽ‰

Asking to modify a language to fix an user issue ???

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

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.