1. Git Conflicts in your Binary Files

    Your team is behind schedule. You are supposed to have shipped 3 days ago. You have a groupon for the latest Superman movie and it expires tonight! Your dog hasn't been out yet and she is known to pee all over your roommate's bed! By your independent calculations the Aztec calendar shows tonight is the night where the planets align just right to point out the site of Montezuma's golden tomb!

    All you need to do is merge these two git branches and you are home free.

    $ git commit -m 'last testsuite written, i am home free'
    $ git push origin ...
                        Read More
                      

    There are comments.

  2. How Angry are your Developers?

    While cursing in your git commit messages probably doesn't correlate to actual anger at your company, here is a quick an easy command to look for curses in your project git logs. (Based on this gist)

    From inside your git repository

    $ git log --pretty=format:'%s' | tr '[:upper:]' '[:lower:]'
           | tr '[:space:]' '\n' | sort | uniq -c | sort -nr
           | grep -iE "(fuck|shit|bitch|damn|piss)"
    

    Looking at my last company's repository, it seems like there was a ... Read More

    There are comments.

  3. Working with a Reverted Git Branch

    A month back I submitted a massive Pull Request (20 commits, 30 files) with some code that I had only loosely tested and it wasn't ready for production (test cases weren't finalized and sandbox testing had only been on my localhost.) Long story short, it got merged and broke a lot of things.

    Oops.

    It was quickly reverted with git revert -m 1 the errors were logged and I was to work on it when I got a chance again. I switched to that branch, fixed the bugs and made a fresh PR with a few more commits only to find that the first 20 ... Read More

    There are comments.

  4. Private Git Repos Hosted on DropBox

    Don't want to shell out to GitHub for a private repository? Use Dropbox instead. You won't get all the collaboration tools that come with GitHub but at least you can keep your source code private and yet distributed without having to setup a server.

    Install DropBox on your computer if you haven't already. [1]

    $ cd ~ && wget -O - "https://www.dropbox.com/download?plat=lnx.x86_64" | tar xzf -
    $ ...
                        Read More
                      

    There are comments.

  5. Page 1 / 1

About

Started writing one year ago, the day after heading out to travel around the world for a year without a cause.
Current Location: New York, New York

Previously:
Mexico City, Mexico
Tokyo, Japan
Hanoi, Vietnam
Vientiane, Laos
Phuket, Thailand
Kathmandu, Nepal
Rajastan, India
Kerala, India
Mumbai, India
Freetown, Sierra Leone
Koidu, Sierra Leone
Mombasa, Kenya
Nairobi, Kenya
Kigali, Rwanda
Rwinkwavu, Rwanda
Boston, MA

Latest Posts

Git Conflicts in your Binary Files

How Angry are your Developers?

Working with a Reverted Git Branch

Private Git Repos Hosted on DropBox