Stuff that is difficult to do in git (but sometimes important)
No original code here yet. Just documenting things dug up elsewhere that I don't want to forget. There is a fantastic series of blog posts by Raymond Chen of Microsoft.
TODO: Describe the challenge of preserving line authorship. Sometimes a fancy "octopus merge" is the way to do it.
- Chen, Raymond. Mundane git tricks: Combining two files into one while preserving line history May 14, 2019.
- Deckstar. How to "Git Copy": copying files while keeping git history Aug. 16, 2022.