git

Are you getting an ‘Unable to negotiate with legacyhost: no matching key exchange method found. Their offer: diffie-hellman-group1-sha1’ error? This article might be for you....

My personal list of basic git hygiene practices that I frequently suggest for most software development teams....

In recent weeks I’ve become intimately acquainted with Logi Analytics' IDE, called Logi Info Studio. There are two aspects of Info Studio which are outmoded: it is neither terribly source control friendly nor very well suited for continuous integration/deployment environments....

Sounded easy enough. Move a git repo from Server A to Server B. How hard could that be?...

Just the other day, git started to continuously prompt me to re-enter my GitHub credentials, despite the fact that I had repeatedly cached my credentials. Why, GitHub, why are you bothering me with this, I pondered. Turns out, GitHub desktop runs a ‘configuration sanitizer’ when it starts up because GitHub has “seen significant issues in the past with other Git clients adding invalid/bad configuration values”. Makes sense. I have, in fact, seen that happen in the past....

If you’ve reached this post by way of a search engine, I’m guessing it’s at least the fifth, sixth, or twentieth one you’ve looked at trying to understand why the hell git mergetool doesn’t launch DiffMerge. Or why git mergetool -tool-help tells you “blah blah blah The following tools are valid, but not currently available: blah blah diffmerge blah blah”. Or: “The merge tool diffmerge is not available as ‘diffmerge’”. You’ve already done everything you think you need to do in order to get DiffMerge and Git playing nicely together, right?...

Closing just the git todo tab isn’t enough. You have to completely quit the text editor....