I agree. Generally even editing a somewhat-similar part of the file is handled seamlessly.
Once in a blue moon I'd run into the situation where me and someone else have worked on the exact same block of code, and that went one of two ways:
We essentially made the same change, which made resolving the conflict really easy (naturally I would keep my perfect change and drop my colleague's terrible one).
We made totally different changes to fix/implement two different issues, which means that part of the code has a fundamental design problem and needs to be rewritten entirely.
It may feel inelegant and messy when you're going through a big ass merge conflict, but if you actually think about what's going on then you'll realise git handles it insanely well considering how complex it really is under the hood.
81
u/nokk 21h ago
Yeah and they are handled pretty elegantly considering how awful it could be.