Skip to content

Add entries for Kinetic Merge for edition 127 #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 30, 2025
Merged

Add entries for Kinetic Merge for edition 127 #798

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
951c0ba
Add entries for Kinetic Merge.
sageserpent-open Sep 3, 2025
eb4d36e
Replace a non-breaking space with a plain blank character.
sageserpent-open Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions rev_news/drafts/edition-127.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,27 @@ __Various__

__Light reading__

<!---

__Easy watching__
-->

+ 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

Expand Down