I _also_ had to do a git merge on my blog because I forgot to pull the content I'd written on another computer aaaaages ago and I was shocked when some content disappeared when I pushed my new stuff up. 😬
@zigg Gosh, that's bad. Hope you didn't lose all content.
@franokuski Nope! Merging solved it; thankfully I’d pushed from the other machine back then 🙂 All is well, it was only momentarily terrifying 😆
@zigg Oh good.