Closed sys4-fr closed 7 years ago
Please do the following commands : 1 (reset the logs state)
git reset --soft HEAD~1
(reset the commit logs of 1)git log
(check if the last commit is the normal one, which actually is https://github.com/MinetestForFun/server-minetestforfun/commit/6fd2c789a6a1c7b081811520fc56fb7e9c600da4 )If the last commit is still one of yours, do it again. Else, 2 (re-add the commit state)
git add .
git commit -a Fix craft recipe of mesecons_microcontroller:microcontroller0000
(remake the commit)git push -f
(force push, overrides conflicting commits)This is meant to make your three commits be one (as excepted) and not flood the commit log
Else, :+1:
I close this pull request for open an another one, because my repository was too weak. It was impossible to becoming to a clean version so I've make a new clean fork of MFF with this last correction.
@sys4-fr Thank you for the other PR, this one is really weird (sorry) :)
Related to issue #528