git fetch && git merge in a breeze - View it on GitHub