There don't appear to be any useful options here to resolve this merge from dev -> main branches. Why? I just want to overwrite whoever changed the main branch incorrectly, but I don't have any option to do that here.
If I right click, I see some options but none of them are useful:
EDIT:
Microsoft released a fix for this issue, you need to install the recent release from: https://visualstudio.microsoft.com/downloads.
It's a known issue in Visual Studio 2019, you can read the thread here.
The official Microsoft solution is:
We have identified the problem and are preparing a fix. Until the fix
can be released, here are a few potential workarounds that may help
unblock you.
Launch TFVC operations that may trigger conflict resolution (ex: Get Latest) from Source Control Explorer rather than Solution
Explorer. In our testing, the bug repros less frequently from Source
Control Explorer entrypoints.
Try disabling the "Optimize rendering for screens with different pixel densities" option in Tools->Options->Environment->General.
Another workaround you can try is:
Inside the "Developer Command Prompt for VS2019", type the command:
tf resolve
This will open (from what it looks like) the same window as the one within VS2019, without styling, but the Merge buttons will are present and usable.
When you are done resolving the conflicts in this window, close it and refresh the merge conflict window inside VS2019 to ensure that VS sees the changes.
Disabling the "Optimize rendering for screens with different pixel densities" option works for me, though I'll note that another coworker here with the same exact version doesn't have that option.
in the next version the bug is fixed ,update your version of vs,
OR
go to =>
Tools/options/environment/General/
Disabling the "Optimize rendering for screens with different pixel densities"
and this is fixed.
Related
Overnight, any help I had for Unity3D in VSCode, i.e. intellisense, disappeared. And I get the sense, no pun intended, that I'm not the only one who's afflicted.
I've tried updating and reinstalling what I assumed VSCode needed to make Unity3D intellisense work. And have checked and re-checked settings, reinstalled VSCode package, in Unity3D.
I've worked through a few tutorials that claimed to address the issue.
What else does VSCode depend on to make this relationship work?
Thanks! Here's to hoping you've fixed this and your life has gotten easier!
Try going to Edit > Preferences > External Tools > Regenerate Project Files (This is because of a bug where the VS Code extension doesn't generate the project files correctly the first time, you can check it out here).
You'll need to be using the VS Code Editor Extension 1.2.0 (you can check which version you're using in the package manager) or later for that option to appear. Also if for whatever reason there are 2 .sln files in your project folder (I've had that happen before, though it's less likely), that also causes problems.
Ok. First, thanks to Lightning_A and Charleh!
The resolution to my specific circumstance was to install the VSCode extension "Unity Snippets Modified" https://github.com/with-heart/vscode-unity-snippets
I had been using https://github.com/kleber-swf/vscode-unity-code-snippets.
Perhaps it's just a matter of Kleber's extension, which is/was great, was broken upon updating Unity to 2020? I dunno and don't have the time to look into it, unfortunately.
Hopefully, my question, the answers I received, and my subsequent resolution saves others from the rabbit-hole I went down.
Again, thanks everyone!
I need to figure out how to turn off emphasized items in Visual Studio Code
This might sound like a strange requirement, but in my workflow vscode functions as less an IDE than a cross-platform ViM-esque frontend with lots of remote development tools built-in.
Due to this use case, I don't need or want the linting features to show up in the file browser. How might I accomplish this?
Attempts to solve the problem
I've run out of search terms here and cannot find an answer.
Searches including terms in this question's title yielded little
SO-specific search queries also yielded little
This seems to be somewhat related, at least as a representation of the "feature" I'm referencing: VS code containes emphasized items but no error
VSCode "preferences" do not appear to show what I'm looking for, likely an issue with me not searching for the right variable name.
In my experience with VSCode it has been wonderfully customize-able, so I'm guessing there's a setting somewhere ready to be modified to accomplish this. Any help much appreciated, thanks!
My use case was a bit different: after viewing some files in a git submodule those files became linted, and errors and warnings cluttered up my VS Code Explorer file browser window on files I had no intention of ever handling. I basically wanted a way to clear out those lint warnings, and found it here. The solution is to reload the window:
CtrlShiftP on Windows/Linux, ⌘ShiftP on Mac -- then select "Developer: Reload Window"
One by-product of reloading the window is that it clears out those unwanted warnings (at least until the next time I visit the file). It also has the effect of clearing out warnings on files that I would normally want to see, of course, but chances are I'll be visiting those files again soon, so it's fine. Not a perfect solution, but it works for me and my use-case; hopefully it can help others.
I don't know how to turn it off, but I had this on multiple folders and I fixed it by renaming the folder to a random name, then naming it back to the name it was before and the error would go away.
If you have this issuse then uninstall extention then CtrlShiftP on Windows/Linux, ⌘ShiftP on Mac -- then select "Developer: Reload Window" then type developer: relode page this issuse automatically resovle
i have this issuse then i uninstall extension then this issuse resolve.
I was able to permanently prevent this by adding the files to the .gitignore file. It seems that this happens in a cloned repository when you add new files.
Has anyone used the old P4SCC plugin with VS 2012, and stumbled upon automatic check out not working? If so, have you resolved it?
I've made sure that the source control is up and running and that in Tools-Options-Source Control-Environment-On Save the "Check out automatically" is selected.
Still, every time I save a modified file, it shows the Save As dialog. Frustrating...
I don't know if it's related to your specific problem, but my automatic check out failed as well the same way you describe (with TFS without P4SCC).
In my case, the problem was that the solution happen to be offline. Right-click on the solution name (at Solution Explorer) -> "Go Online" and the issue was resolved!
When I update my local working copy of an SVN repository in Eclipse using the Subversive plugin it isnt bringing any new files which have been added to the SVN repository. It thinks that the local working copy is up to date and if I ask Eclipse to update it it just says no further changes.
Anyone got any ideas why this is happening?
I just discovered this nasty problem too. It might be related to this bug report.
Deleting the entire tree worked for me too, but that hardly seems like a satisfactory solution. What scares me more is wondering how I will notice that a certain file didn't get updated, if this happens again.
Thanks to the above bug report, this worked for me (eclipse 3.7):
Team/Update to Version...
v Update to HEAD revision (=default)
Depth: Full recursive (default is Working copy)
v Change working copy to specified depth (default is un-checked)
O Ignore externals (=default)
v Allow unversioned obstructs (=default)
I do not know if that fixes the problem permanently. At least it seems a faster solution rather than full checkout.
Sorry I don't have a solution to this problem, but I have it as well, and I don't have enough cred to comment.
Here is a thread describing the same issue:
http://www.eclipse.org/forums/index.php?t=msg&th=14710&start=0&
A "workaround" I found to be successful is deleting the relevant tree (of course, backing it up first) and performing an "update". I am prompted to recreate missing files, which bring the un-added files from the repo as well. Obviously this is a terrible solution, but it does work.
Another interesting effect to note is that it is one-sided. The other machine on the repo is perfectly fine with updating new files.
I have noticed Subversive to be a bit problematic. While this isn't a direct solution to your problem, may I recommend using TortoiseSVN (assuming you're in Windows). It works excellently, has more power than Subversive, and is integrated with your shell making it a smooth transition.
Is Eclipse's undo history broken? I have been using 3.1, 3.2, 3.3, and now 3.4 versions for the last few years and was always able to undo only about 20-25 changes back in history.
This nonsense has cost me some lost modifications countless times when trying to revert some recent changes (if you reply with "you should commit to svn every 25 changes", I'm going to unleash dragons on you).
There's a setting in Preferences->Editors->Text Editors->Undo history size and I set it to 1000 but it didn't help anything.
I'm mostly using Eclipse with the Perl E.P.I.C. in the Perl Perspective, if it matters.
So guys, what's the problem and how do I fix it?
I'm experienceing the same problems and I am also using Eclipse with EPIC.
It seems this is a known issue with EPIC, see http://sourceforge.net/tracker/index.php?func=detail&aid=1728227&group_id=75859&atid=545274
Reported in 2007, so I'm surprised it hasn't been fixed :(
Edit: Yay! This is now fixed in EPIC version 0.6.37
Testing show that for low values of the property it does indeed work - I'm using the Java Editor.
Perhaps you can try and see if the Java Editor respects those settings - I'm too lazy to make > 50 changes and undo, and if it does file a bug against E.P.I.C.?
Not a direct answer, but Eclipse maintains a local history of edited files (Context menu -> Restore from local history). Maybe that would be a better way than going back 25 steps in the undo-history.