New GitHub App automates resolving merge conflicts (JavaScript only)

MergeResolver is an experimental GitHub application for JavaScript projects. When you install MergeResolver on a repository, it waits for a conflict to happen. Conflicts can happen with new pull requests, or when a new commit to master conflicts with one … Read more

Similar

Rails and JavaScript: Part 1

Previously on Locally Sourced: Well, in 2005 I came across a cool web framework called Ruby on Rails. More recently, I wrote a book about integrating Rails and front-end tools. If you want, you could buy it. Today, I thought I’d go back to the beginning… (more…)

Read more »

Wait for User to Stop Typing, in JavaScript

Let's say you have a search feature on your website that you want to live-update while the user types. The naive implementation would be to send a query to your server on every keystroke. This quickly falls apart, however, because users easily type faster... (more…)

Read more »