You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: rev_news/drafts/edition-127.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -53,7 +53,7 @@ __Git tools and sites__
53
53
54
54
+[Kinetic Merge](https://github.com/sageserpent-open/kineticMerge) is a command-line tool that helps you merge a heavily refactored codebase and stay sane.
55
55
Its goals are to:
56
-
+ Merge two branches of a Git repository*holistically across the entire codebase*.
56
+
+ Merge two branches of a Git repository*holistically across the entire codebase*.
57
57
+ Take into account the motion of code in either branch due to refactoring.
+ 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.
0 commit comments