There are times when ReSharper gets confused. It might be unable to locate references if you've been re-jigging your packages (oo-er) or it might be unable to perform a refactoring on a file because its in read-only mode for no good reason.
While there's always ReSharper clear caches through the Visual Studio settings...
I've been using the command line more recently, so decided to make a script to do this from the root directory of the repo. Depends on having Git installed on the command line. And expects the ReSharper version is 8.2. And that you haven't tweaked where RS keeps it caches.
Its a PowerShell script, so add the contents to your PowerShell profile and set an alias if you like.
Showing posts with label git. Show all posts
Showing posts with label git. Show all posts
Monday, 3 August 2015
Wednesday, 14 November 2012
How to set up git mergetool
1. Download and install DiffMerge
2. Find and open your .gitconfig file. If you installed Git using GitHub for windows then it should be in C:\Users\your_user_name\.gitconfig.
3. Append the following:
Adjust the exe file path if it has changed since version 3.3.2 or you have the 32bit version on a 64bit machine.
4. When a conflict happens after a pull or merge, just type git mergetool at the command prompt and you'll get diffmerge all up in your grill. The left column is your version, the right colum is the remote version, and the center column is the result of the merge. Complete the merge, save and close. No other git commands are required after closing.
5. That is all.
ps. you can use any diff tool you want - just adjust the config accordingly.
2. Find and open your .gitconfig file. If you installed Git using GitHub for windows then it should be in C:\Users\your_user_name\.gitconfig.
3. Append the following:
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = \"C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe\" --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
keepBackup = false
Subscribe to:
Posts (Atom)