visual studio - TFS/GIT in VS Cannot switch to master because there are uncommitted changes -

-

i've setup git repository vs 2013 solution on visualstudio.com. repository worked great while becoming accustomed using tfs (in git mode).

then decided familiarize myself branches, created branch off of master. i've made quite few changes in branch. i've committed changes on time , have performed sync push local commits visualstudio.com repository. works.

the problem having somehow lost ability of switching master branch. cannot merge newly created branch master. every time try involves master following error in vs:

cannot switch master because there uncommitted changes. commit or undo changes before switch branches. see output window details.

the output window never contains 'details'...

what "uncommitted changes" message refer to? since cannot master branch have no way of committing of changes (nor sure want to?). , current (only other) branch in has been committed , sync'ed.

i'm learning tfs, git , source control. how safely recover problem?

okay, had same issue myself rwkiii - bug in visual studio , not easy 1 fix. here symptoms:

visual studio states cannot merge/switch braches/etc. because have uncommitted changes - fine, except changes have been committed.

cannot switch master because there uncommitted changes. commit or undo changes before switch branches. see output window details.

here's screenshot clearer.

if @ output window, may appear empty have change "show output from" "source control - git". list file visual studio thinks has changes.

make sure "source control - git" selected

now, things tried didn't fix (so don't have to):

  • restarting visual studio
  • restarting machine
  • switching projects
  • using external git tools (all of said "no changes")
  • git reset
  • making arbitrary changes file , committing that. commits ok, vs still thinks there's more changes

in end, had go , delete file disk, "undo" change team explorer window:

click "undo" restore file , ability switch branches

not ideal solution, seem fix it.


Comments

Post a Comment

Popular posts from this blog

c++ - QTextObjectInterface with Qml TextEdit (QQuickTextEdit) -

-
i registred handler simple qtextobjectinterface , draws 10x10 red rectangle. when used qtextedit in normal qwidget app, worked. when used qquicktextedit (textedit qml component) in qt quick app, doesn't worked (nothing drawed, rectangle in textedit reserved, because when change cursor position, notice there something, empty space, nothing drawed. qtextobjectinterface intrinsicsize method called (that explains why see there empty space 10x10), drawobject method isn't. i did research , found problem here: qquicktextedit.cpp qt 5.3.0 sources (line 1821) qsgnode *qquicktextedit::updatepaintnode(qsgnode *oldnode, updatepaintnodedata *updatepaintnodedata) { . . . if (textframe->firstposition() > textframe->lastposition() && textframe->frameformat().position() != qtextframeformat::inflow) { updatenodetransform(node, d->document->documentlayout()->frameboundingrect(textframe).topleft()); c...
Read more

javascript - angular ng-required radio button not toggling required off in firefox 33, OK in chrome -

-
i trying toggle required attribute on radio button using angular show html5 popup. i cannot following code function correctly in firefox 33. function correctly in chrome. required property being toggled via checkbox value, in firefox, when set false radio button still acts required , shows html5 required popup. see plnkr below example doesn't work me in ff 33. <!doctype html> <html> <head> <script data-require="angular.js@*" data-semver="1.3.1" src="//code.angularjs.org/1.3.1/angular.js"></script> <link href="style.css" rel="stylesheet" /> <script src="script.js"></script> </head> <body ng-app="myapp"> <script> angular.module('myapp',[]) .controller('mycontroller',['$scope',function($scope) { $scope.foorequired=true; $scope.submitform = function() { $scope.submitmessage = ...
Read more

xcode - Swift Playground - Files are not readable -

-
Image
files not readable in swift playground . how make files readable? same code runs on xcode terminal app, fails on swift playground. demo code below. import foundation println("hello, world!") var fname:string = "/users/holyfield/desktop/com.apple.iconcomposer.plist" var fm:nsfilemanager = nsfilemanager.defaultmanager() if(fm.fileexistsatpath(fname)){ println("file exists") if(fm.isreadablefileatpath(fname)){ println("file readable") var fd:nsdata? = nsdata(contentsoffile: fname) println(fd?.length) let pl = nsdictionary(contentsoffile: fname) println(pl?.count) println(pl?.allkeys) }else{ println("file not readable") } } else{ println("file not exists") } sample images: i have thank nate cook first quick response , solid answer. just case share answer post, title misleading. see nate's answer here: https://stackoverf...
Read more