Re:Git cherry-pick and revert use 3-way merge
by wnoise on Friday November 10, 2023 @02:25PM
(#38223313)
How else would it?
[ Parent
| on HN ]
Re:Git cherry-pick and revert use 3-way merge
by dboreham on Friday November 10, 2023 @02:38PM
(#38223490)
Was going to say the same: all the hash linking and what not is fine but 3-way diff is how SCC is actually done (otherwise it'd just be "a DAG comprising whatever unrelated file contents the user provided".