Re: Messed up a salsa commit - how best to fix?
On Sun, Apr 24, 2022 at 09:01:02PM +0100, Julian Gilbey wrote:
> Hi,
>
> Somehow I managed to really mess up a commit to python-qtconsole: the
> upstream and pristine-tar branches do not have the upstream/5.3.0
> sources (the current ones). However, there's already an
> upstream/5.3.0 tag in the repository, pointing to a commit to the
> master branch.
>
> I think the simplest thing to do is to "rewrite history": delete the
> head commits to the master branch and the 5.3.0 tags, and then
> recommit correctly and force-push to salsa.
>
> Would people be OK with me doing this,
I'm not OK with rewriting history.
> or do you have an alternative suggestion?
Accept the failure, learn from it, move on, make new mistakes, learn from them.
In other words: Do not spend energy on erasing a mistake^Wlearing expirience.
> Best wishes,
> Julian
>
Groeten
Geert Stappers
--
Silence is hard to parse
Reply to: