nilbus

6 ms·

1. 1.▲
   Take the pain out of Git conflict resolution: use diff3(blog.nilbus.com)

   2 points by nilbus 9y ago|0 comments
2. 2.▲
   by nilbus 12y ago

   flock? :)
3. 3.▲
   by nilbus 14y ago

   Yeah, I could never justify a service like this for $100/yr. It's cool, but it's also free to get a local google voice number that forwards to the cell and just press 9.
4. 4.▲
   by nilbus 14y ago

   I'm the author of this answer on StackOverflow. It seems to me like everyone in this post on SO is united in something that just seems very wrong to me. I'm clearly the minority here, but am I wrong? I'd like to hear your thoughts.
5. 5.▲
   Git rebase workflow is not better for conflict resolution (stackoverflow.com)

   2 points by nilbus 14y ago|3 comments
6. 6.▲
   by nilbus 15y ago

   very cool
7. 7.▲
   by nilbus 15y ago

   Thanks! It was the destructuring part that I wasn't understanding right away.
8. 8.▲
   by nilbus 15y ago

   Could someone explain how {@foo} = bar compiles into this.foo = bar.foo;?
9. 9.▲
   by nilbus 15y ago

   Chrome 15 solved / worked around this problem by smooth scrolling whenever you page up/down. Without the instant jump, the eye can easy tell where the page is compared to where it was before.
10. 10.▲
    by nilbus 15y ago

    I like how everyone is addressing the core problem. However, to give a more superficial answer, have you checked out http://www.causerific.com ? Some of the causes on there might be right what you're looking for, and could potentially empl
11. 11.▲
    Use capistrano to deploy Rails apps to Windows servers(github.com)

    2 points by nilbus 15y ago|0 comments
12. 12.▲
    by nilbus 16y ago

    Just kidding! Follow the instructions in the script, and it works on localhost just fine. :-)
13. 13.▲
    by nilbus 16y ago

    Apparently you can't just run the script with node and point your browser's http proxy to 8080. I suppose transparent proxy and http proxies act differently?