My kingdom for a Git smart enough to resolve that kind of conflicts...
Computers in 2018: I can tell you if there's a bird on a picture.
Also computers in 2018: I literally can't tell that two lines are basically the same except for a trailing comma.
Computers in 2018: I can tell you if there's a bird on a picture.
Also computers in 2018: I literally can't tell that two lines are basically the same except for a trailing comma.