You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Personal C# .editorconfig inspired by Resharper and Jetbrains Rider defaults
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Then make sure that for all recoding/playback audio deviced in the soundsettings the exlusive mode is disabled.
Next configure your "Default Playback device" in Windows Sound options to be the device you want to here on, eg. your headphones or speakers.
And configure the "Default Recording device" in Windows Sound options to be the device you want to recode on. Usually your Microphone.
Setup p4merge as difftool and mergetool on Windows
For the final day of the course, we will be looking at how to resolve merge conflicts. One way to do it is via the command line. Another is to use a visuallising diff tool. We will be using P4Merge as our tool and this should be set up for the final day of the course.
There are two ways to set it up: using the command line, and directly editing the config file. Choose the method that you are more comfortable with. I usally tend to use the former.
Setting up from the command line
Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:
Now let it run for a while. It collects the slow queries ( > 100ms) into a capped collections, so queries go in and if it's full, old queries go out, so don't be surprised that it's a moving target...
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters