Thank you for putting me on the right track! The issue was all due to me messing up git. All fixed now.