Git Product home page Git Product logo

mismerge's People

Contributors

beartocode avatar bronzdragon avatar valeriymaslenikov avatar

Stargazers

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

Watchers

 avatar  avatar

mismerge's Issues

FR: Option to not collapse missing lines

With the same setup as #16, I'd like an option for MisMerge to show empty space for the missing lines instead of collapsing it to a line. So, all three of the windows would have 3 lines, but the missing ones would not have a line number and would be colored differently.

Collapsing missing lines can be very useful if there is a huge block, but can also be confusing, so I'd make it optional.

image

FR: Button to delete text in center pane if it's deleted on one side

Let's say I'm in this state:

image

There is a nice button that allows me to move the insertion of a from the right pane the middle pane.

I'd like there to also be a nice button to move the deletion of c from the left pane to the middle pane.

P.S. I might file a few more FRs shortly. This is probably the most important of them, though.

I'm currently trying to make a diff editor with the ancient https://codemirror.net/5/demo/merge.html. mismerge is the best alternative to it I found, and I thought I'd record my wishlist for it. Thanks for making it! It's a pretty UI.

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.