> 1) Merging. It's really simple, much more than what we think at first. I explained it myself here, in section "three-way merge": https://lucasoshiro.github.i

> 1) Merging. It's really simple, much more than what we think at first. I explained it myself here, in section "three-way merge": https://lucasoshiro.github.io/posts-en/2022-03-12-merge-submodule/#three-way-merge https://lucasoshiro.github.io/posts-en/2022-03-12-merge-subm... There are plenty of other explanations out there if mine isn't enough clear for you, just google "Three-way merge". > blend two functions or whatever and it "works." It's purely based on find changes and it doesn't check the syntax. If the commits has been merge correctly is responsibility of the programmer. Look at this valid Python code: if a == 1: foo() bar() If a branch deletes foo() and other branch deletes bar(), it will merge to this invalid Python code: if a == 1: In Python we can't just leave empty blocks, like C or Java. In Python we would need to use "pass": if a == 1: pass So yeah, there are cases that merge doesn't work because Git operates over data, no matters too much what information they hold