Post #1765252

Okay, apparently my other computer had also the invalid commit. Once I reset the main branch to parent commit on that machine and force pushed it, I could then push from the other machine and the conflict resolved it. The solution was found on Radicle Zulip chat.