How do diff/patch work and how safe are they?
问题 Regarding how they work, I was wondering low-level working stuff: What will trigger a merge conflict? Is the context also used by the tools in order to apply the patch? How do they deal with changes that do not actually modify source code behavior? For example, swapping function definition places. Regarding safety, truth be told, the huge Linux kernel repository is a testament for their safety. But I wondering about the following points: Are there any caveats/limitations regarding the tools