#Git


Posts From The Archive

Getting Logi Info Studio To Play Nice With Git & CI/CD

A look at some basic limitations with Logi Analytics' IDE

In recent weeks I've become intimately acquainted with Logi Analytics' IDE, called Logi Info Studio. I haven't yet used it enough to have a strong sense of Logi's platform as a whole, but there are definitely two aspects of developing with Info Studio which I've found outmoded: it is neither terribly source control friendly nor very well suited for continuous integration/deployment environments. [Read More]

GitHub Desktop Removing Credential Settings When Loaded

(There's a fix for that!)

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. [Read More]

How To Configure Git To Work With DiffMerge

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? [Read More]

Git Config Changes Not Saved When Edited With Notepad++

Turns out, closing the tab isn't enough

This is pretty stupid, but here it goes. A few minutes ago I decided to try something new: editing Git config settings with an external text editor. My default text editor is Notepad++. So I typed git config -e -global into my Git terminal window, made the changes I wanted, saved and closed the file. Well that was easy! But let’s run that command again, just to make sure it worked. [Read More]