Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
Got Emoji working #841
Would you mind rebasing and squashing? I'm not sure if you're new to git or only Open Source, so I'll walk you through it in case.
First, you need to have the upstream repository (kytrinyx/exercism.io) as a remote. I think you probably do because of the merge commits that I see.
git remote -v
This should show my repository as a remote. I'll assume it's named
Then, make sure you have the latest version of everything:
git fetch upstream
You need to be on the
git checkout emoji
Then, rebase from upstream's master:
git pull --rebase upstream master
If you look at your git log, you'll see that the merge commits that you had have disappeared.
Next I'd like the 4 commits to be a single commit, since they're really 1 thing.
This will kick off an interactive rebase back to the last commit before yours:
git rebase -i 01e179898cda0b31d46fe065eb488d53afb3e750
You'll get a screen that has your list of commits, like this:
To squash the last ones onto the first ones replace
When you write and quit the file, it will tell you that it is rebasing, and finally it will open the text editor with the following commit message:
It's actually much longer.
Now you can delete everything in the window and just type:
Write and quit the file, and you'll have a single commit with your changes.
To update the pull request, force push to your branch:
git push -f origin emoji
Let me know if you get stuck!
I have been using git for a while, but this is the first time I am doing real collaboration on git. Thanks for the knowledge shared.
I got it working but noticed the app doesn't start with:
gem 'rouge', github: 'rsslldnphy/rouge', branch: 'fix/table-inside-pre'
in the Gemfile
So I change that part to:
to get the test environment running.
Thanks once again
We need this to be left as is, because it fixes a bug in how clojure code is displayed.
There are now very many commits that do different things. I'd like the pull request to be a single commit that represents only the emoji changes.
Can I help you get this sorted out?
On Sun, Oct 6, 2013 at 2:09 PM, Katrina Owen email@example.com:
Hm. Odd, I'm still seeing merge commits.
I've also been looking at the steveklabnik/emoji gem that @iHiD pointed out, and there's a lot that I like about it:
Want to work with me on a version of this from scratch in a new branch? I'll just provide pointers and we can discuss here in the thread if you get stuck. I'll set up the CDN in the meanwhile.
Cool (feel free to say no if you have better things to do, though, this issue can totally wait).
OK, so first step, make sure that your master is exactly like the upstream master:
git fetch upstream git checkout master git reset --hard upstream/master git push -fu origin master
This will make your master branch both locally and on github match the upstream master.
Next, create a fresh branch:
git checkout -b skemoji # calling it sk for Steve Klabnik
That way the old branch is still around.
I'm going to create a tiny project that does only one thing: Serve emoji images. That way we can put that project on a CDN and then refer to that CDN from exercism.io.
Cool. I'll keep working to figure out the CDN thing.
Would you try to get the
Here's my suggestion:
Then use that environment variable in the application:
Does that make sense?
Okay, would work on it later today and buzz you if I need a hand
@kytrinyx I have had a look at emoji gem and found its assets(emojis) are not as much as the one I tried using earlier, the kind of parsing it has is not relevant in the current use case (unicode), it however helps in generating paths (if you consider this a valuable to require a gem for then I would else I wouldn't need a gem for this purpose), if I am missing things please let me know(as I would still need to parse the text to look for regex matching :emoji:)...
ATM revert back to the old code, making EMOJI_PATH(lib/app/public/img/emoji) an environment variable like you recommended, I would await your CDN tomorrow before I push my commit.
@bjhaid I haven't looked at this in depth, so I don't know what makes more sense.
I don't have strong feelings about which emojis we use, though I definitely want to use a CDN to serve the assets. (I haven't heard back from them, which is understandable since it is Sunday).
In short: as long as this is some sort of simple parsing that takes
Thanks for researching this!
No problems, would look up issues I can help with. Thanks