search

NucleoidMC / koth

King of the Hill
GNU Lesser General Public License v3.0
0 stars 13 forks source link

Blommor map #55

Closed sockfriends closed 4 months ago

sockfriends commented 2 years ago

did i do this right

Restioson commented 2 years ago

There are some conflicts to resolve

Restioson commented 2 years ago

Just reminding that there are still conflicts but i'm not sure if it was merged in another PR?

sockfriends commented 2 years ago

i dont have write access

Restioson commented 2 years ago

You do, it's your own fork

sockfriends commented 2 years ago

well it says i dont

Restioson commented 2 years ago

I don't know how to help you because the conflicts need to be resolved on your side since they come from your branch of your fork; what are you doing that tells you that you don't have permission? You definitely have permission to push to sockfriends/koth:blommer-map

sockfriends commented 2 years ago

Screenshot (1066)

Restioson commented 2 years ago

The reason that is greyed out is because the conflicts are too complex to be resolved in the web UI, not because you don't have permission - it's also greyed out for me.

sockfriends commented 2 years ago

oh ok

Restioson commented 4 months ago

Was merged already i believe