For whatever reason, git seems to have a really difficult time resolving conflicts in YAML.
Elliot Shank
Music-obsessed software geek. One of Breakmaster Cylinder’s Internet weirdos. He/him.
Music-obsessed software geek. One of Breakmaster Cylinder’s Internet weirdos. He/him.
For whatever reason, git seems to have a really difficult time resolving conflicts in YAML.