latextools | A collection of tools for building rendering | Document Editor library

This is how to resolve your Sublime Text key binding conflict.

• Install the BoundKeys package.

• Run BoundKeys by selecting List bound keys from the Command Palette.

• BoundKeys will create a new buffer (unsaved file) which lists all of your key bindings on a file by file basis, i.e. all the .sublime-keymap files that ST has loaded.

• Have a look at this BoundKeys example output. The example has been heavily edited, enough so that you can easily see the essential components.

• The keys from each .sublime-keymap file are shown, with the highest precedence (highest priority) file at the top, while those from the file with the least precedence (lowest priority) are shown last.

• In the example output have a look at the bottom line in the top .sublime-keymap file, the User package. shift+f10 has been assigned to the context_menu command, the right-hand column shows that there is a conflict with the ChooseWindow package. Look a little down and you'll see the corresponding line in the ChooseWindow package - the shift+f10 line shows a conflict with *User*. The *asterisks* show that this key binding has been overwritten by the one in the User package.

• Now search your BoundKeys output for Super+Alt+F. You should be able to tell where the key conflict is and it should be fairly easy to see how to resolve the conflict.

• Note that you may have to search for Alt+Super+F as well. It should be clear that Super+Alt+F and Alt+Super+F are the same key binding but not the same text.

The hint is in the darker red elements of the diff, which highlight the characters that have changed. Note that it's not just a uniform width at the end of the line, there are a variable number of characters highlighted, but they're all whitespace.

What has probably happened is that during editing, your colleague has left various insignificant whitespace at the end of lines - spaces where sentences have been edited, tabs where formatting has been adjusted, etc. Their editor was probably not configured to display this whitespace, so they didn't notice.

Your editor, however, was configured to automatically trim off such whitespace - quite a common feature - so as soon as you touched the file and saved it, the ends were all tidied up.

Either you can turn the feature off, your colleague can turn it on, or you could just ignore the whitespace in the diff view by adding ?w=1 to the URL (unfortunately, this disables commenting, as it messes with the line numbers sometimes).

SmartGit seem to execute a series of git.exe command, each one having to spawn a bash session (spawning/starting a new shell is slow).
See more at "How are msys, msys2, and msysgit related to each other?"

If you do the same in a git bash session, all those commands (for each submodule checkout) can reuse the current shell session: much faster, even on Windows.