Reset a Branch to Remote State with git
Every once in a while I accidentally hose my repository's master branch by merging or committing something I shouldn't. And then on rare occasion I push that to my remote and then things get all sorts of messed up. Every PR from that point on has some wonky commits and I look like a noob. Sometimes the best course of action is to just reset to the a remote branch's master (i.e. the repository I forked the project from) and get on with life that way. Here's how to do so:
git fetch some-remote # "origin" if you want to use your own branch
git reset --hard some-remote/master
The first step is fetching a list of branches from the remote. The next is executing a hard reset of the branch based on the remote.
Now you can stop asking yourself how things got so messed and up can get back to business!
![Designing for Simplicity]()
Before we get started, it's worth me spending a brief moment introducing myself to you. My name is Mark (or @integralist if Twitter happens to be your communication tool of choice) and I currently work for BBC News in London England as a principal engineer/tech...
![fetch API]()
One of the worst kept secrets about AJAX on the web is that the underlying API for it, XMLHttpRequest
, wasn't really made for what we've been using it for. We've done well to create elegant APIs around XHR but we know we can do better. Our effort to...
![Introducing MooTools ScrollSidebar]()
How many times are you putting together a HTML navigation block or utility block of elements that you wish could be seen everywhere on a page? I've created a solution that will seamlessly allow you to do so: ScrollSidebar. ScrollSidebar allows you...
![Link Nudging with CSS3 Animations]()
One of the more popular and simple effects I've featured on this blog over the past year has been linking nudging. I've created this effect with three flavors of JavaScript: MooTools, jQuery, and even the Dojo Toolkit. Luckily CSS3 (almost) allows us to ditch...