Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Base+Meta: Add Canadian Provincial Flag Emojis #25598

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Conversation

DZve
Copy link
Contributor

@DZve DZve commented Dec 29, 2024

Added Canada's 10 provinces (updated Quebec) and 3 territories to the emoji set. 🇨🇦
strip-viewable

@bplaat
Copy link
Member

bplaat commented Dec 29, 2024

Hey @DZve nice work. But can you please force push changes to a exisiting pr when you make mistakes instead of closing and recreating it.

@DZve
Copy link
Contributor Author

DZve commented Dec 29, 2024

Sorry!! Still learning how to use github

@DZve DZve marked this pull request as ready for review December 29, 2024 20:56
@github-actions github-actions bot added the 👀 pr-needs-review PR needs review from a maintainer or community member label Dec 29, 2024
@AtkinsSJ
Copy link
Member

Hi there! Git takes some getting used to. I definitely messed up a lot at first, so don't worry, it does get easier.

We like to keep the git history neat, so all the changes you've made here should be combined into one commit (because they're all part of the same change). To do that, I'd recommend this video, but feel free to ask here or in the Discord chat if you need help.

In future I'd recommend learning how to use git branches too - they make it possible to work on multiple separate things at once, and also help avoid some issues that can come from working on master directly.

Also, don't worry if you mess things up and seem to lose your work - the old commits will still be there and it's possible to recover them. Specifically I'll make a note here that a025fc6c31417bfdc0d41d08cfc2554755dc59fc is the last commit at the moment.

@DZve
Copy link
Contributor Author

DZve commented Dec 30, 2024

Hm. I don't know why compiling failed this time around. I didn't edit any code, and the images and text file edits are all the same, I just squashed the commits.
Edit: Seems like just bad timing. The PnpIDs server seemed to be down.

@nico nico merged commit e166003 into SerenityOS:master Jan 2, 2025
12 checks passed
@github-actions github-actions bot removed the 👀 pr-needs-review PR needs review from a maintainer or community member label Jan 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants