From 951c0ba52ce2cc14e74ac5e88d21fafa344174ba Mon Sep 17 00:00:00 2001 From: Gerard Murphy Date: Wed, 3 Sep 2025 10:08:55 +0100 Subject: [PATCH 1/2] Add entries for Kinetic Merge. --- rev_news/drafts/edition-127.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-127.md b/rev_news/drafts/edition-127.md index c4615b51b..138d6f17c 100644 --- a/rev_news/drafts/edition-127.md +++ b/rev_news/drafts/edition-127.md @@ -40,12 +40,27 @@ __Various__ __Light reading__ - + ++ Kinetic Merge in action + + [Merging through a file split](https://youtu.be/JHb9DKK0LIA) + + [Complex merge demonstration](https://youtu.be/6jry6NKxGJA) + + [Merging code embedded inside an if-statement](https://www.youtube.com/watch?v=sm4Naq_zJU0&t=2s) + __Git tools and sites__ ++ [Kinetic Merge](https://github.com/sageserpent-open/kineticMerge) is a command-line tool that helps you merge a heavily refactored codebase and stay sane. + Its goals are to: + + Merge two branches of a Git repository *holistically across the entire codebase*. + + Take into account the motion of code in either branch due to refactoring. + + Handle file renames, file splits, file concatenation. + + Handle code being excised from one place in a file and moved elsewhere in that file or to somewhere within another file, or hived off all by itself in its own new file. + + Work alongside the usual Git workflows, allowing ordinary Git merge to take over at the end if necessary. + + Be a simple command line tool that tries to do as much as it can without supervision, and with minimal supervision when complexities are encountered. + + Written in Scala, under an MIT license. ## Releases From eb4d36efdadec553c7f116b9741d7b989a092096 Mon Sep 17 00:00:00 2001 From: Gerard Murphy Date: Wed, 3 Sep 2025 10:17:26 +0100 Subject: [PATCH 2/2] Replace a non-breaking space with a plain blank character. --- rev_news/drafts/edition-127.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-127.md b/rev_news/drafts/edition-127.md index 138d6f17c..a6bc820e1 100644 --- a/rev_news/drafts/edition-127.md +++ b/rev_news/drafts/edition-127.md @@ -53,7 +53,7 @@ __Git tools and sites__ + [Kinetic Merge](https://github.com/sageserpent-open/kineticMerge) is a command-line tool that helps you merge a heavily refactored codebase and stay sane. Its goals are to: - + Merge two branches of a Git repository *holistically across the entire codebase*. + + Merge two branches of a Git repository *holistically across the entire codebase*. + Take into account the motion of code in either branch due to refactoring. + Handle file renames, file splits, file concatenation. + Handle code being excised from one place in a file and moved elsewhere in that file or to somewhere within another file, or hived off all by itself in its own new file.