Add view for remote-only emojis #1846
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
God dammit. I wish GitHub let you set a default merge target since 99% of the time I don't want to merge upstream. Sorry for the noise. |
|
On second thought, I find this to be pretty useful, maybe it's worth considering? Make "stealing" emojis easy since it does the work of filtering out already-local emojis so you don't have to. If there's a local emoji you want to overwrite, the existing "All" or "Remote" lists would work.
|
|
This pull request has merge conflicts that must be resolved before it can be merged. |
prplecake
force-pushed
the
cit/custom-emoji-remote-only
branch
from
726a61e to
06713f1
Compare
|
This pull request has resolved merge conflicts and is ready for review. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.