From 54d19df2413750cd78fdc196a3be5e54cef988a7 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 23 Apr 2018 21:31:31 +0100 Subject: [PATCH] Remove draft --- source/_posts/2018-04-23-back-to-the-future-git-diff-apply.md | 1 - 1 file changed, 1 deletion(-) diff --git a/source/_posts/2018-04-23-back-to-the-future-git-diff-apply.md b/source/_posts/2018-04-23-back-to-the-future-git-diff-apply.md index 1a6fde0c..c405cccc 100644 --- a/source/_posts/2018-04-23-back-to-the-future-git-diff-apply.md +++ b/source/_posts/2018-04-23-back-to-the-future-git-diff-apply.md @@ -6,7 +6,6 @@ summary: | I was having some issues this past weekend where, despite everything working fine locally, a server was showing a “500 Internal Server” after I pushed some changes to a site. In order to bring the site back online, I needed to revert the site files back to the previous version, but as part of a new commit. tags: - git -draft: true slug: back-to-the-future-git-diff-apply --- The `git reset` commands removed the interim commits which meant that I couldn’t push to the remote (force pushing, quite rightly, isn’t allowed for the production branch), and using `git revert` was resulting in merge conflicts in `composer.lock` that I’d rather have avoided if possible.