After latest update of TortoiseGit, there is added preference to automatically skip rebasing/fast-forwarding when there is nothing to rebase. I accidentally chose this option in dialog but TortoiseGit enabled it permanently and I can't change it back.
Do you know of any way how to reset this preference?
Do you know how to reset all TortoiseGit preferences or where they are stored? (Uninstall didn't help.)
Thank you!
I had the same problem and I think I have discovered where the settings are saved.
You should open regedit and go to:
HKEY_CURRENT_USER\Software\TortoiseGit
There you will find a DWORD setting:
OpenRebaseRemoteBranchUnchanged
And there is also a similar one which mentiones fast forward. You can delete both of them and the prompt window will reappear again.
Related
I am using TortoiseGit 64 bit version on Windows 10. I know it has a reset option because the documentation talks about it. However, I cannot find the menu option for "Reset". I have searched the preferences to see if it needed to be added but I cannot find it anywhere. Here is a screen capture of my TortoiseGit menu.
Right now, the reset dialog can only be opened using the log dialog context menu.
cf. https://tortoisegit.org/docs/tortoisegit/tgit-dug-showlog.html
To add onto MrTux,
Go to the log dialog, right click on the commit you want to revert to and there should be a 'reset "current branch" to this' popup. If you want to clear all local changes in favor for this commit, then perform a Hard reset.
I had the same problem but couldn't figure it out from the answer here.
But the way I did it was, after I did a fetch there was the option to do a reset in the dropdown in the bottom corner of the dialog
I am using VS2010 SP1 and TFS Version 10.0.40219.417
Now what happens is that I attempt to type in a non-checked out file, and well, nothing happens. VS does not check out the file. I have to manually check out the file for check in.
It's happening with me only. On my colleague system it's working fine. I have cross checked all the settings he has done in his VS2010. Please suggest what should I do ?
You probably covered this in "I have cross checked all the settings", but I'm going to ask anyway.
From How to: Disable Automatic Checkouts
In Visual Studio, on the Tools menu, click Options.
In the Options dialog box, click Source Control, and then click
Environment.
In the On Edit box, select a different option than Check out
automatically. The other available options are as follows:
Prompt for check out
Prompt for exclusive checkouts
Do nothing
Click OK.
Do you have "Do nothing" checked?
EDIT:
If the above setting is correct the next thing I would double check is if the solution is "Online". I have lost the connection without realizing it several times, it is worth an extra check.
To check:
Right-click on the solution name at the top of the Solution
Explorer and check if you have the "Go Online" option
When running P4Merge, the comparison method is always initially set to 'Recognize line ending and white space differences' (aka all changes). I want to use 'Ignore line ending and white space length differences', but I have to manually re-set this every time the tool runs.
I have changed the setting:
with the toolbar button
in the preferences dialog
on the File menu
and it never sticks. In fact, the preferences dialog entry is reset every time I go back to the menu, without even closing the program. I have changed the setting before using the Exit command from the File menu and before closing the window, and also before saving a merge.
In the past I was able to save my setting and have it be remembered, unfortunately I don't have any recollection of the software version involved. I was using P4Merge as standalone and none of the rest of the Perforce suite was installed.
I can update with any other supporting information that might prove relevant.
[Edit: It's the radio button setting in the preferences dialog that ignores changes and resets every time it's viewed, not the File submenu.]
If you are in Unix/Linux, I would blow away the .p4merge directory in your home directory, which stores all your preferences. In Windows, I'm sure there is a similar directory in your home folder. Sometimes things can get out of sorts in that directory, and cleaning it out could help. After doing so, try saving your preferences again (do it via Edit -> Preferences to change the defaults) and restarting p4merge.
If that doesn't work, it could be a buggy version.
It looks like this issue was fixed in 2013.3. I ran into this issue, updated to the latest version of P4, and the problem was resolved.
I'm using Visual Studio 2010 and AnkhSvn. There's a panel called PendingChanges (it's main panel). I use it to switch to different branches. There is a combo-box with path to current branch and "Other..." entry. I think when I switch to different branch it supposed to remember path to previously loaded branch so I can quickly switch back. But it doesn't. Am I doing something wrong? Or maybe there is a setting to do that? Is there a quick way to switch between different branches?
P.S. Don't know whether this question is for SO. If not, delete please.
You're not doing anything wrong. The drop down doesn't show recent branches (yet).
Just installed AnkhSVN and I see the equivalent of "svn up" but I'd prefer to run "svn st" first so that I don't just blindly update.
The next release of AnkhSVN will enable the 'Recent Changes' tab in the pending changes window. This allows the equivalent of 'svn st -u' (It shows outgoing and incoming changes).
We are still working on the usability of this view in the
daily builds.
Input welcome on the AnkhSVN users list.
There's a pending changes window you can add that will show what files you have changed in your local working copy. I usually keep it in the set of docked windows where the output window is. In general, you can also tell what status a file is in by the icon next to the file. For example, a plus sign means that it's been added.
UPDATE: Here's a guide to the icon overlays. They should be about the same as in Tortoise SVN.