Looking for some editor for complex Git merge commits. Is there some editor where you can work with patch, edit all files at once, move changed blocks, etc. Thinking about interactive diff2html:

  • add possibility to edit whole patch/items and auto-update results
  • edit patch items like change destination (+/- buttons, shortcuts or even dragging)

Simply replace merge and edit by editting patch to get final merge result you want. "No" need to review or adjust after such a extended merge + have patch or commit you can save or reapply next time on similar code versions, etc.

Or another example - imagine github pull request fully editable. Having ability to adjust changes - expand before/after, edit anything anywhere, etc. and save patch or apply results somehow...

Maybe similar to Linux Text editor with integrated diff, but seems like Eclipse is a huge "workaround". And reinvent wheel may not be the best way (start from scratch).

Asked also here https://stackoverflow.com/questions/70640721/visual-diff-patch-editor to show a demo snippet.


Your Answer

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy

Browse other questions tagged or ask your own question.