opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove draft

Browse source
This commit is contained in:
Oliver Davies 2018-04-23 21:31:31 +01:00
parent f2020ccff1
commit 54d19df241
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/_posts/2018-04-23-back-to-the-future-git-diff-apply.md
View file

@ -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.