Added some stuff.
No idea. I tried to push dev, which I had just rebased. And it asked me to pull stuff down and merge it.
Merged dev into dev.
Merged soem paths