Skip to content

Instantly share code, notes, and snippets.

View zzl0's full-sized avatar

zzl zzl0

176 followers · 154 following
View GitHub Profile
@zzl0
zzl0 / version_control_diff_patch_merge_analysis.md
Created September 4, 2023 21:47 — forked from CMCDragonkai/version_control_diff_patch_merge_analysis.md
Version Control Diff, Patch and Merge Analysis (mostly Git)

Version Control Diff, Patch and Merge Analysis (mostly Git)

Inspired by this: https://github.com/mndrix/merge-this

Intrafile-Intraline Change

Where branch A and branch B changes 2 different contiguous sets of characters on the same line, but the changes are non-overlapping. Both changes can change the line length arbitrarily.

@zzl0
zzl0 / learning_rust.md
Created February 6, 2024 05:40 — forked from noxasaxon/learning_rust.md
Learn Rust!