search

comcode-org / hackmud_wiki

https://wiki.hackmud.com/
Other
13 stars 21 forks source link

Edited the colour codes page to add some automatically highlighted colours. #403

Closed dayofni closed 4 months ago

dayofni commented 4 months ago

Problem

Wanted to add some of the in-game uses of colour. Fixed some issues with the formatting.

Context

The page wasn't quite complete yet, so I wanted to add the last bits of information. I'm not 100% sure if all of the colours are correct, but hopefully, they're close enough.

seanmakesgames commented 4 months ago

Looks like you might be using the same branch as before-- because we use the 'squash' merge method, the main branch doesn't understand that all of these changes were already merged and thinks that they are in conflict. (this is why the files changed tab looks full of stuff that's already been merged)

To sort it out, re-sync your fork and make a branch off of main again (there are a whole bunch of different ways to resolve the state you are in, and this is just one of them)

I'll discuss with the team switching back to 'merge commit' merge method so that this is not a problem in the future.

seanmakesgames commented 4 months ago

Tried to do the rebase for you on this one, but could not because don't have push perms to your repo.

Would love to get these changes in if we can. :)

Fayti1703 commented 4 months ago

Tried to do the rebase for you on this one, but could not because don't have push perms to your repo.

You should be able to push regardless -- this PR has the "allow edit from maintainers" flag set, so as long as this PR is open you can push to the source branch (in theory, anyway).

I'll give it a try later; see if it works on my end.

seanmakesgames commented 4 months ago

Tried to do the rebase for you on this one, but could not because don't have push perms to your repo.

You should be able to push regardless -- this PR has the "allow edit from maintainers" flag set, so as long as this PR is open you can push to the source branch (in theory, anyway).

I'll give it a try later; see if it works on my end.

please do. It did not work for me.

Fayti1703 commented 4 months ago

I'll give it a try later; see if it works on my end.

please do. It did not work for me.

Worked on my end -- curious if you've maybe set up the remote incorrectly? Might be worth looking into at some point.

seanmakesgames commented 4 months ago

Worked on my end -- curious if you've maybe set up the remote incorrectly? Might be worth looking into at some point.

glad you tried. likely this is what was wrong when I tried.