Good enough!

In the last few weeks I have started contributing to Servo, a Mozilla Research project. The project is hosted on GitHub but instead of doing code reviews using the GitHub interface it uses a third party website called OperaCritic.

When my pull requests are accepted it displays the following (click for a bigger version):

The first time I read it quickly and I had to re read it again to make sure if it was a good message or not. Found it pretty funny 🙂

I like it when people (or the things they create) don’t take always take themselves too seriously.

Updating pull request branch with changes from upstream in GitHub

I don’t know if it’s the most efficient way but here’s one way of dealing with updating a pull request from a personal branch after upstream/master has been updated.

I update my origin/master:

git checkout master

git fetch upstream

git merge upstream/master

I switch to my local branch:

git checkout local-branch-name

“Pop” the PR commit back into unstaged:

git reset HEAD^

This will remove the last commit (I usually rebase all my PR commits into one before submitting a PR but you can also specify HEAD~x where x is the number of commits you want to pop back out) and put it back into unstaged.

And then try to merge master into the branch:

git merge master local-branch-name

If it merges cleanly I can proceed with a commit. If it can’t merge cleanly, I stash the unstaged changes, I merge and then pop the stash likewise:

git stash

git merge master local-branch-name

git stash pop

And then take care of the merge conflicts manually. You will get info on which files are in conflict by doing:

git status

After all of this I can commit and push the branch to GitHub which will update the pull request.

dispatcher has a fresh new face

The original design for dispatcher was lacking. It used a standard GitHub page theme and the page had been quickly written.

I wasn’t satisfied, so this weekend I changed the design and took the opportunity to use a CSS framework other than Bootstrap. After looking at 3 or 4 alternatives I ended up using Pure. It’s simpler and more basic than Bootstrap but for a static sites like dispatcher this proved beneficial.

Here are some before and after shots of the site:

BEFORE:

AFTER:

Go check it out!

Some interest for Dispatcher

This took me by surprise but Dispatcher one of my GitHub project has gone in the last 24 hours from being starred 0 times and forked 0 times to being starred 18 times and forked once.

This is surprising since I had not touched the project for weeks and the Dispatcher website has seen little traffic.

I really feel like getting back to working on Dispatcher now. I just have a to finish some work in progress I have on two other open-source projects and then I will get back to it.