Conflict resolution on git


Git is just amazing. Learning command line git is one of the best thing that has happen to me. I’ve been lucky to work with some talented guys from bocoup, and I’ve gotten to know quite a bit about it lately and just wanted to document things that I do when I encounter that dreaded (well, not THAT bad) “We can’t automatically merge this pull request.” message.

Also if you have not seen this Cheat Sheet do yourself a favor and take a look.

So, pull request can’t be merged. It’s because what you worked on (likely your branch) have some conflicts with what you are trying to merge, likely origin/master. this stack overflow answer was useful in understanding what I am doing.

My instinct was to git pull. But that is a bad idea (Quick! git reset origin/your-working-branch --hard to get what you have pushed to github!). When you encounter “can’t merge” message, git’s help suggest this:

Step 1: From your project repository, bring in the changes and test.

git fetch origin
git checkout -b your-working-branch origin/your-working-branch
git merge master

fetch then merge is much better than pull. Pull does too much under the hood (as my co-worker Tim says “too much magic”). But still, chance is that you may end up with WAAAAY too many conflicts and therefore very hard to resolve them. Perhaps there is even better idea:

git fetch --all (You may not have to do –all, but I am paranoid and this is my feels safe blanket, if you know what I mean. It’ll ensure you have the latest remotes.)
then git rebase origin/master

Ah, rebase. I had sort of hard time understanding concept of rebase, but perhaps git’s message explained it to me the best. It says “First, rewinding head to replay your work on top of it…” All your commits are “replayed” after changes that are already in master. People used words like “flattening the history” when explaining rebase, which was confusing to me. but “replay your work on top” explanation worked best for me.

When you rebase, or “replay your work on top,” you resolve conflict one by one, as it encounters conflict.

You may get a message like this:

Applying: My commit 1.
Using index info to reconstruct a base tree...
M	source/js/file.js
M	source/js/folder/file.js
Falling back to patching base and 3-way merge...
Auto-merging source/js/folder/file.js
CONFLICT (content): Merge conflict in source/js/folder/file.js
Auto-merging source/js/file.js
CONFLICT (content): Merge conflict in source/js/file.js
Failed to merge in the changes.
Patch failed at 0002 My commit 1.

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

Nice to have that –abort option. Unlike merge or pull, you can just forget about the whole thing. Continue till you are done.

But because rebase changes the history, you may get message like this.

Your branch and 'origin/your-working-branch' have diverged,
and have 95 and 2 different commits each, respectively.
 (use "git pull" to merge the remote branch into yours)

If you push force that message will go away
git push origin your-working-branch --force

$ git push origin your-working-branch -f
Counting objects: 51, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (13/13), 1.56 KiB | 0 bytes/s, done.
Total 13 (delta 8), reused 0 (delta 0)
 + 368da98...4266772 your-working-branch -> your-working-branch (forced update)

When you push force you’ll see the previous sha and the new one, so if you mess up and want to revert, simply reset hard on that previous sha and push force again
they look like previous_sha…new_sha

so in this case
git reset 368da98 --hard

In case of “Oh Crap, I made a spelling mistake and I just pushed that.”

You could git reset HEAD~1 -- soft to undo last commit and re do it, OR,
change the file, then git commit --amend
Either way, since you already “Pushed” you need to push –force to make it work.

If your working directory is dirty (meaning you have conflicts) and you don’t have any work you need to save:

# Cleans the working directory.
git reset HEAD –hard

# Reset the branch to the remote (in this case your-working-branch.
git reset origin/your-working-branch –hard

Continue reading…

Open Vis Conf 2014 was amazing! Love that conference.

Good people at Bocoup puts out this kick-butt conference in Boston every year. I am lucky to have participated in both of those years.


I only was able to go to one day of it this year, but it was very interesting and inspiring as last years. I whole heartedly agree with Mike Bostock’s sentiment of “design is hard” and it was helpful for me to see his breakdown of why. Neat to know about “Fitts’s Law.” NYTimes git tool called “Preview” which takes screenshot of git commits are pretty cool. Thoughts on explanatory graphic vs exploratory graphic. He says don’t be afraid to fail. Try bad idea deliberator to evaluate it. He says “Javascript” is “One True Language.” Sam Selikoff’s js framework talk was very interesting and I need/can’t wait to see the code. Kennedy Eliot of WaPo and Jen Christiansen’s talk was very close to my field. Print publication with online challenges. Finding “Narrative” in data. Story telling is important. All good design/presentation is a god story. ICanHaz.js sounds really interesting. I need to check it out. All the other talks, I have notes to go over, but was great. Nice to see all the folks too. Those are my people. Very inspiring.

I’ve been posting links that I liked at Posterous (RIP) and then my tumblr blog. Here are the week worth of Articles that I liked: Friday, May 9, 2014:

My talk from css meetup: Vector-based Responsive Web Design


I had a great time talking at April 22, 2014 Cascade Bos meetup. My talk was titled: Embedded web fonts, Icon fonts and SVG – Vector-based Responsive Web Design using CSS.

Coincidentally, the same day, Chris Coyer of CSS-Tricks have published a blog post titled: Inline SVG vs Icon Fonts [CAGEMATCH].

His conclusion is very similar to my conclusion but better!

If you can go IE 9+ / Android 3+, inline SVG is better at pretty much everything than icon fonts. If you need the deeper browser support, I feel like an inline SVG fallback would be too big of a pain to be worth it.

Definitely worth a read if you are interested in this topic.

Continue reading…

Got Galaxy S5 with Android KitKat 4.4


I know the photo is terrible, but I wanted to capture the screen size. It is large enough to view any responsive websites without trouble while still fitting in my pocket.

Did it. I have been an iPhone user for a while, but switched to Android. Got myself an Galaxy S5, and like it alot. I noticed that there are bunch of apps out there, perhaps more choices, but quality seems to vary a bit. Looks like you need to be more selective what you choose to use. So far, the transitions were very smooth. I was using Google for most of my stuff — like gmail, contact, google calendar etc — anyway, so that was very simple. And Dropbox integration was great. It is definitely more like computer than phone, and I like it. Samsung Health app have replaced my (lost) fitbit and Sleep as Android app seems fine replacement for SleepCycle. Al the other apps that I was using on iPhone, like MLB At Bat, Waze, FoodSpotting, Wunderlist, Social Media apps (facebook, Twitter, Linkedin, Foursquare, Instagram), Evernote, OpenTable, Fantasy Baseball apps (Yahoo, CBS and ESPN) all have native android native versions. Google Play Books are as good as iBooks, and iCloud/Find iPhone capability can be (seems to be, anyway) found on Android Device Manager.

Couple of memos:

  • Lost my “Alternative Password” once already. To reset it, you just deregister all if your finger prints, and when you strat the process over, it will ask you to set alternative password.
  • I was recommended to check out Google Now, Keep, & Newsstand. All services that I was not familier with, but it looks interesting. Especially Keep.
  • Chromecast and its $35 price tag is really enticing.
  • A Tech friend, and Google guy, recommended following utility stuffs for me: Advanced Task Killer is good for keeping on top of background processes, ES File Explorer is a good general purpose file manager.
  • I am looking for pod catcher. He recommended AntennaPod, but it looks a bit too basic… Trying out Pocket Casts, (not free) but liking it so far.
  • MBTA Bus stuff, I was using Catch the Bus on iPhone, just because it was one of the first one out and did its job but since there are bunch of free ones now I am trying out YourBus MBTA. It is pretty good and seems accurate.

I’ve been posting links that I liked at Posterous (RIP) and then my tumblr blog. Here are the week worth of links:

Foundation connecting my (front-end) world

I don’t even remember how I first found Zurb Foundation, but it have almost become my obsession. It’s everywhere.

One of the smartest guy I know and a good firend in Tokyo, Keiichi, contacted me and told me that he is going to bootstrap this StartUp. I have not heard from him in a while, And I was really glad and I told him that I will help create his website. Immediately, I started thinking I will create something cool with Foundation and Jekyll. I need to update my repo

Lucky for me, Kianosh Pourian and Dale Sande’s excellent Sass in Depth book came out about the time when I was getting into Foudation and its beautifully crafted SASS, it has been a great help and timing. I took Advanced Foundation class last year, I’ve converted my blog to Reverie-based one and I have successfully integrated Pattern Lab (another of my obsession, you could say — and I know, I know, Brad Frost says “do the sh*t yourself…”) with Foundation for my work, on vagrant box, no less!

So perhaps it was just fitting that I made my first Open Source pull request on github today. On Foundation. Yay, Open Source!

Anyway, perhaps foundation js and require js integraton next? Who knows!

I am a huge fan of Zurb Foundation and I hope they will stop in Boston for their World Tour and perhaps organize a Boston Foundation Users Meetup? Not sure if there are enough interest? Maybe we can host Cascade Bos meetup?

Random front end tips and tricks

I am learning tons this week. Very exciting. Working with smart people of Bocoup, learning/picking up tricks and tips on how to do many little “a-ha, that’s how you do it” things.

Here is my notes:

  • With Editor Config, you can create a project specific configfiles for your text editor of your choice. I am using sublime, and there is a package for that. Now we have a file on the project home that specify that we use tab for indentation for our project — that’s our style that we agreed on, and we are keeping it consistent — but I can start using two spaces for my other projects with this.
  • Bower is powerful. It’s managed by Twitter. Their stock is now at $40. Time to buy?
  • This gist by Matt Surabian is awesome. If you put it in your .bash_profile, your terminal shows your branch and with a * star if there is a change that needs commits. I use terminal with white backgroudn so I change like 38 to

    echo " on "$PURPLE$branch$dirty

    If you don’t want new line, get rid of \n from line 41.

  • I am learning about require js and Asynchronous Module Definition (AMD) API (Boy, do I have a lot to learn) but here are some example of diffrent types of AMD flavors by Tim Branyen and also, example of how to use it on multi page. I think I will start with Anonymous CJS style and see how it goes from here.

I’ve been posting links that I liked at Posterous (RIP) and then my tumblr blog. Here are the week worth of links:

The other side of story: Horace Wilson who introduced baseball in Japan

(This blog post also appears in blog.)

Filling this under interesting and odd/strange story related to Japanese baseball.

Horace Wilson

The name Horace Wilson is well-known in Japan. I can confirm that it is true — I even knew his name. “The one who taught us baseball,” Japanese say. It’s an answer to a trivia question, and in first sentence in the “History of Baseball In Japan“. He has a plaque at Japanese Baseball Hall of Fame at Tokyo Dome. I seem to recall seeing that in person last time I visited there in 2008.

He is originally from Maine, and there was an interesting report on Boston’s WBUR, about his decedents, who didn’t know anything about what he did in Japan. The reporter, Theo Balcomb, is a family member.

Japanese Baseball Began On My Family’s Farm In Maine

After Horace Wilson left the farm in Maine and fought in the Civil War, he traveled to Japan in 1871 and became a teacher. He then taught at what would become Tokyo University. There, he introduced to the students the game of baseball. This is my own opinion, but I think the duel between a pitcher and a batter, even though this is a team game played between teams, had appealed to the Japanese “samurai” style — I think of the duel between Musashi Miyamoto and Kojiro Sasaki on Ganryujima in the early 1600’s. but I digress.

I think it is fascinating that his family was completely unaware until the Japanese historian contacted them. I guess Horace never bothered to tell the family, or perhaps he didn’t think much of it then — who could imagine that the baseball will be cultivated in Japan over hundred years, through World Wars, and produce likes of Ichiro Suzuki and two World Baseball Classic Titles. Whatever the reason, this is a very unique story, and worth a read/listen.

“The Guest House” by the 13th-century poet Rumi

The Guest House

This being human is a guest house.
Every morning a new arrival.

A joy, a depression, a meanness,
some momentary awareness comes
As an unexpected visitor.

Welcome and entertain them all!
Even if they’re a crowd of sorrows,
who violently sweep your house
empty of its furniture,
still treat each guest honorably.
He may be clearing you out
for some new delight.

The dark thought, the shame, the malice,
meet them at the door laughing,
and invite them in.

Be grateful for whoever comes,
because each has been sent
as a guide from beyond.

— Poem by Rumi, translated by Coleman Barks

Vagrant+Puppet is AMAZING!


At my work on my team, we have five main developers. Two of us are on Mac, while the other three are on Windows. I, as a front end guy in the group, am advocating for SASS/Compass be used prominently on the redesign, like in depth use (great book btw). There is one little problem — workflow. To be able to developed locally, SCSS require pre-compiling, and it uses ruby. Mac comes with ruby, but Windows does not. Grunt could do it, but then you need node.js/npm. If I want everyone on my team to have it, I need to install all of those (ruby/sass/compass/node/npm/grunt)… that would be just way too much customization/potential places to break.

Enter Vagrant and puppet. It is just amazingly awesome. You can create a linux machine on VirtualBox – which is an open source VM. I am running latest puppet-enabled ubuntu box available from puppetlab, which is Ubuntu 13.10 (saucy Salamander).

Dealing with Vagrant really tickled my inner linux nerd-ness. Once upon a time, I was involved with running a group called BJLUG, Boston Japanese Linux Users Group — this was way back when, when you still had to pay for Apple’s CJK Language Pack to have Japanese installed on your machine, and I figured out that if you use linux, it was FREE to write email back to Japan etc. There were certainly a lot of LUGs back then. Not sure if they are around any more.

I learned how to install puppets, thanks to my colleague Kevin D. who patiently walked me through it, and was able to create box with apache and the likes.

Now we all need to download, and then just run vagrant up and vagrant provision. And your local scss changes, on your filesystem, using your favorite text editor on your OS, will be watched and css is compiled without any additional work. This is beautiful.

The Vagrant CLI documentation was useful for me, who have not used Vagrant before.

Some useful command:

  • vagrant up – Start the VM
  • vagrant provision – Provisions the VM
  • vagrant ssh – Logs into the VM with ssh
  • vagrant reload --provision – Restarts and provisions the VM
  • vagrant suspend and vagrat resume – If you don’t want fully shut the VM down
  • vagrant halt – Stops the VM
  • vagrant destroy – Deletes the VM

Actually, first time I saw use of vagrant was WordPress VIP team’s quick start. It includes all their server hosting environment. They do good work there over at VIP. And also there are ways to have local WordPress environment in vagrant such as Varying Vagrant Vagrants (VVV) environment. I am still using MAMP for my local wordpress theme/plugin development (when I have “free time”) but perhaps I should reconsider it. For new version of theme?
Continue reading…

Slashathon! My third hackathons in 10 days.


SXSW was pretty awesome. Total geek out. I have to go though all my notes, but it was very good. Meeting Brian Holt from Reddit was definitely the highlight, and went to two hackathons, first the Hackathon For Social Good, and then Slashathon! It was pretty cool. Event was held at Capital Factory in Austin, and the place was gorgeous. We had a plane to catch, but I kept coding in the airport… final product looked like this: Groupieology. SeatGeek’s API is pretty amazing: it requires no API Key, unlimited and very eimple to use. Including the Baseball Hack Day the Saturday before, it was my third hackathon in 10 days. My buddy Kevin Davis was a good sport and attended all three with me. Pretty crazy stuff.

Have not had a chance to use it, but this service, sounds really cool. I need to check it out and see if I can use it for some hacks in the future.

I’ve been posting links that I liked at Posterous (RIP) and then my tumblr blog. Here are the week worth of links:

Continue reading…