search

theRSAorg / state-of-paralysis-report

This repository contains code used to analyse the data presented in the 'Stuck in a rut' chapter of the 'State of paralysis' report.
https://www.thersa.org/reports/state-of-paralysis
Other
0 stars 0 forks source link

Clear up history #4

Closed JolyonJoseph closed 9 months ago

JolyonJoseph commented 9 months ago

Before we open this publicly let's clear up my data mistake by deleting the commit from the history. I've never done this before and looks like it requires care including backing up the repo, so maybe we'll need to agree a day to do this. Found some info here but haven't looked it through fully yet: https://medium.com/@mgm06bm/ultimate-guide-on-how-to-delete-commit-history-in-github-35cc11d74571#:~:text=Deleting%20commit%20history%20in%20Github%20can%20help%20you%20clean%20up,using%20the%20git%20rebase%20command.

JolyonJoseph commented 9 months ago

@eirini-zormpa has successfully rebased to remove WAS data from history. I think the way for us to bring these changes in is to merge. Unfortunately this might make the history a bit messier as we'll have two sets of commits for the two histories. This source was helpful https://www.atlassian.com/git/tutorials/merging-vs-rebasing

A potentially simpler alternative is for us to simply clone the repo from the remote as a new project and work from there.

JolyonJoseph commented 9 months ago

We still need to remove my FRS mistake. This was the very first commit so need to understand how best to do it

eirini-zormpa commented 9 months ago

okay that was actually not that different! Insead of using the SHA-1 of the commit, you use root. So the command would be git rebase --interactive --root