Closed korewaChino closed 4 months ago
Personally, I prefer rebases over merges, especially before a PR is merged
There was a merge conflict so I used the GitHub merge conflict interface to solve the conflict, which unfortunately forces merges. I could've used the cli but it's pretty annoying when it's an outside repository I have no direct git access to.
I apologize about that, should've given @madonuko access to my fork.
Superseded by #13.
Closes #7