fresh icon indicating copy to clipboard operation
fresh copied to clipboard
Published 6 hours ago • verified publisher icon sinelaw

Three-way merge like IntelliJ

Open sinelaw opened this issue 1 month ago • 1 comments

sinelaw avatar Nov 20 '25 22:11 sinelaw

Progress made in https://github.com/sinelaw/fresh/pull/151

To complete it:

  • Fix performance issues
  • Add highlighting in OURS/THEIRS around areas that are involved in the conflicts
  • Fix closing issues
  • etc

sinelaw avatar Nov 23 '25 00:11 sinelaw