You can re open the Resolve Conflicts window if you closed it by mistake from Team Explorer. Goto: Pending Changes, then from the Actions drop down, select Resolve Conflicts.

From there you can click Get All Conflicts.

Normally VS will prompt you to resolve any conflicts as soon as you do one of the following:

 - Get latest
 - Check in
 - Merge 

Click the link I surrounded with a red contour in the Team Explorer pane.

[![enter image description here][1]][1]

And in Visual Studio 2013:

[![enter image description here][2]][2]


  [1]: http://i.stack.imgur.com/bRgmd.png
  [2]: https://i.stack.imgur.com/3zQsL.png

If you&#39;re coding in C# then on your Visual Studios editor, select the Tools menu, then the options submenu.

A dialog will pop up.  From there select Text Editor, then select C#, then select Advanced.

Then check the box for Show live semantic errors.

     &lt;form class=&quot;form-asd&quot; role=&quot;form&quot;&gt;
        &lt;h2 class=&quot;form-signin-heading&quot;&gt;login&lt;/h2&gt;&lt;hr /&gt;
        &lt;label class=&quot;control-label&quot;  for=&quot;username&quot;&gt;Username&lt;/label&gt;
        &lt;input class=&quot;form-control&quot; type=&quot;email&quot;  required=&quot;&quot; placeholder=&quot;username&quot;data-error=&quot;enter username&quot;&gt;&lt;/input&gt;
        &lt;label class=&quot;control-label&quot;  for=&quot;username&quot;&gt;password&lt;/label&gt;
        &lt;input class=&quot;form-control&quot; type=&quot;password&quot;  required=&quot; &quot; placeholder=&quot;Password&quot;&gt;&lt;/input&gt;
        &lt;label class=&quot;checkbox&quot;&gt;&lt;/label&gt;
        &lt;button class=&quot;btn btn-lg btn-primary &quot; type=&quot;submit&quot;&gt;submit&lt;/button&gt;
    &lt;/form&gt;
  how can we change this default message of popover of the require field &quot;Please fill out this field &quot;to &quot;please enter username&quot;


  [1]: http://i.stack.imgur.com/01bOx.png

How to change the default message of the required field in the popover of form-control in bootstrap?

I&#39;m trying to add some unit tests to one of my projects.

So far I&#39;ve installed and configured karma, and have installed jasmine. I&#39;ve one test file in my `test/` folder.

The karma server has started, the browser page is ready, but `karma run` fails as follows:

    $ karma run karma-conf.js 
    [2014-06-14 15:19:11.046] [DEBUG] config - Loading config /foo/test/karma-conf.js
    Waiting for previous execution...
    Chrome 35.0.1916 (Linux) ERROR
      You need to include some adapter that implements __karma__.start method!

This error message doesn&#39;t Google well.

Is this something obvious, or do I need to provide more information?

Error: You need to include some adapter that implements __karma__.start method

When I do a Get Latest in Visual Studio, if there are conflicts, there is nothing that is displayed to me to make it obvious. Invariably I think everything is OK, do a build, and often the build works.

The onus is always on me to remember to look for conflicts, to open the Conflicts window.
Is there any way to make VS get in my face, and tell me that there is now a conflict?

How to get Visual Studio to open Resolve Conflicts window after a TFS Get

<p>When I do a Get Latest in Visual Studio, if there are conflicts, there is nothing that is displayed to me to make it obvious. Invariably I think everything is OK, do a build, and often the build works.</p>
<p>The onus is always on me to remember to look for conflicts, to open the Conflicts window.
Is there any way to make VS get in my face, and tell me that there is now a conflict?</p>


When I clean and then build my solution that has several projects, the output window reports that the build succeeded. However, when I view the *Error List Window*, it shows me this warning:
 
&gt;Found conflicts between different versions of the same dependent assembly that could not be resolved.  These reference conflicts are listed in the build log when log verbosity is set to detailed.	C:\Program Files (x86)\MSBuild\12.0\bin\Microsoft.Common.CurrentVersion.targets

When I double-click this message, it opens the *C:\Program Files (x86)\MSBuild\12.0\bin\Microsoft.Common.CurrentVersion.targets* file but I don&#39;t understand anything in it.

I am using Visual Studio Express 2013 for the Web.

How do I find out what&#39;s wrong and with which DLL and how do I then make the warning go away?

Found conflicts between different versions of the same dependent assembly that could not be resolved

I am unable to edit any files in a project in Visual Studio 2013.  It only happens in one project.  If I open a different project I am able to type fine, but once I go back into the problem project I am unable to type in the editor windows.  Not sure if it matters but the project that is giving me issues we are using SVN on.  The other projects are just local ones on the machine.  I have restarted Visual Stuido, restarted the computer and still am unable to edit the files.  Any ideas?

Unable to type in Visual Studio

I am very familiar with the Visual Studio IDE, and am new to working with Android Studio. Is there a way to configure Android Studio so that the keyboard shortcuts that I&#39;m used to from Visual Studio can be used in Android Studio?

How can Visual Studio shortcut keys be used in Android Studio?

I&#39;ve found a few links but they don&#39;t explain how this is done. I can debug using Xamarin Studio IDE but that IDE (no offense) is lame compared to Visual Studio 2012.  
Using Visual Studio 2012, there appears to only be option to select an emulator to debug. So how do I get it to debug on my real device via USB (I already have USB Debugging = true)?

How do I debug on a real Android device using Xamarin for Visual Studio?

I have a simple solution in visual studio 2013 that is composed by one web project, one library project and one unit test project. When I open the solution and try to run the unit tests they are not discover by visual studio. To run the tests I try to go to the menu and choose Test -&gt; Run -&gt; Run all tests or by opening the test explorer window. By those to methods visual studio doesn’t discover any tests in the solution.

Creating first a simple unit tests project and try to run the test, visual studio know discover the test and I can run it. Then, if I open my previous solution visual studio now discovers all the tests. I try to save my solution but closing it and reopening, without creating a unit test project first, the visual studio doesn’t find the tests again. This is a very strange behave that I don’t know why this is happening. 

I used to working alone in this project that was using the source control git integrated with the visual studio team foundation. The problem of visual studio not discover the unit tests start when a new element came to the project and when I need to recreate the solution through the source control online. Before this, all tests always been discovered by visual studio.

For creation the unit tests I use the dll Microsoft.VisualStudio.QualityTools.UnitTestFramework. My version of visual studio is: Microsoft Visual Studio Express 2013 for Web Version 12.0.30723.00 Update 3. My version of .net framework is 4.5.50938.

All of my tests are like this: 

    [TestClass] 
    public class Service1Test 
    { 
        [TestMethod] 
        public void Test1() 
        {
            Assert.IsTrue(True); 
        } 
    }

Visual Studio 2013 doesn&#39;t discover unit tests

I use Visual Studio Team Services to store the source code of my projects as I work on them, I love the service, especially that it is free, but I have been running into the biggest pain lately.

Randomly when I go to save, modify, check in check out I get this error for every single file I am modifying.  So if I am trying to save changes to 8 files I get this message 8 times and it takes 45 60 seconds of trying to check out for each file meaning to takes 6 - 8 minutes for the errors to stop (even if I hit cancel).
   
&gt;The local data store is currently in use by another operation

I looked it up online and found many people with the same issue but the response from MS has nothing to do with my situation.

http://blogs.msdn.com/b/phkelley/archive/2013/05/31/tf400030-the-local-data-store-is-currently-in-use-by-another-operation.aspx

It basically says this can happen when you have to many files in your workspace or have several large solution open at once.

This does not apply to me as I usually only have on solution open at a time and my projects are very small (400 -500 files).

Constantly get The local data store is currently in use by another operation when working on small projects

Is there a URL that I can bookmark for my team&#39;s TFS *Current Sprint* task board? We have 2-week sprints so the URL changes every 2 weeks.

The default URL is of the form:

    http://[Server]/tfs/[Project]/[Team]/_backlogs/TaskBoard/[SprintName]#_a=people


The `[SprintName]` part of the URL changes every sprint, thus it doesn&#39;t provide a stable URL. I&#39;m wondering if there&#39;s some version of the URL that always points to the current sprint, i.e.:

    http://[Server]/tfs/[Project]/[Team]/_backlogs/TaskBoard/CURRENT#_a=people

TFS Current Sprint URL

How to make solution as clean copy without mapping to TFS ? The problem is that this message shows when I am trying to open it. I want to open it as normal without TFS connection. 



![enter image description here][1]


  [1]: http://i.stack.imgur.com/begG7.png

Remove TFS Connection From Solution

I am using Visual Studio 2010. Some months back I was using some &#39;ABC&#39; TFS user to connect to TFS and mapped some folders on my local drive. Now my previous user &#39;ABC&#39; is gone and I am allotted a new tfs user &#39;XYZ&#39; to connect to TFS. So naturally I tried mapping some remote folder to my existing local folder and I got the following error.

*&quot;The working folder &#39;Some_Local_Path&#39; is already in use by the workspace WORKSPACE_NAME:USER_NAME on computer &#39;MACHINE_NAME&#39;&quot;*

I have tried removing the cache folder contents but the same error (C:\Users\{UserName}\AppData\Local\Microsoft\Team Foundation\3.0\Cache).
I have also tried running the commonly found TFS command (tf workspaces /remove:*) to delete the caches for all worksapaces but still the same error.
When I try to edit my workspace, it shows source control and local folders for my current user &#39;XYZ&#39; but what I want is to remove the folder bindings for my previous user &#39;ABC&#39;. How can I achieve that?


how to remove TFS workspace mapping for another user

I&#39;m not getting something about Visual Studio&#39;s Git for TFS.

I cloned a colleague&#39;s solution in Git on TFS and started adding code. I then realised that I needed my own branch for the changes I was making, and so following the instructions in [Push a new local branch to a remote Git repo and track it too](https://stackoverflow.com/a/6232535/575530) I ran 

    git checkout -b e4ctim
    git push -u origin e4ctim

When I make changes to my code visual studio shows the familiar red-tick icon by the code file to reassure me that the change has triggered the file to be checked out:

![VS red-tick][2]

And then when I save the file the Visual Studio returns the icon to the blue padlock. I assume that this change from red-tick to blue padlock signifies that the change has been checked-in locally in Git:

![VS blue-lock][3]

But when I look at the history of the modified file, there is none!

![No history][4]

**I would like to commit my changes locally and sync them with the TFS server.**

Visual Studio does not see any changes at all:

![VS TFS Changes][5]

From the command line I can see that Git has noticed all of my modifications by running the command

    git status

and seeing lots of changes not staged for commit and untracked files.

![git status cmd][7]

Looing at the [Git book](http://www.git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository) I could use 

    git add

or more specifically

    git add -u .

to stage the files ready for a commit but I&#39;m reluctant to do that as the [Develop your app in a Git repository (track, commit)](https://msdn.microsoft.com/en-gb/library/vstudio/hh967655) Visual Studio documentation states:

&gt; Q: Where is the Git stage?   
&gt; A: If you are an experienced Git user, you might have noticed that 
&gt; Visual Studio handles changes differently than the command prompt. 
&gt; You might have wondered if the Included Changes section contains 
&gt; your staged changes. In fact, Visual Studio usually bypasses the Git 
&gt; stage for you. When you commit changes, Visual Studio simultaneously 
&gt; stages and commits them. The one exception occurs when you add a 
&gt; file to your Git repository; Visual Studio does stage this kind of 
&gt; change.

**Visual Studio stages and commits changes simultaneously. But why is it not listing any of the modifications I have made to tracked files as changes, and thus letting me commit them?**


  [1]: http://i.stack.imgur.com/pMw4L.png
  [2]: http://i.stack.imgur.com/8OJnj.jpg
  [3]: http://i.stack.imgur.com/PMrck.jpg
  [4]: http://i.stack.imgur.com/DVh2i.jpg
  [5]: http://i.stack.imgur.com/qQkHi.jpg
  [6]: http://i.stack.imgur.com/44YE0.jpg
  [7]: http://i.stack.imgur.com/4RaOM.png

Visual Studio TFS Git not seeing any changes

I&#39;m working on a team with a few developers using git on BitBucket. We are all working on a `dev` branch, not pushing to `master` until a release.

One of the developers committed incorrect code that overwrote my own by accident, and now I am trying to push the correct code  back to the repo. I have been reading about this error for a few days now, I can&#39;t push to the repo anymore because I am getting the following error:


     ! [rejected]        master -&gt; dev (fetch first)
    error: failed to push some refs to &#39;https://myusername@bitbucket.org/repo_user/repo_name.git&#39;
    hint: Updates were rejected because the remote contains work that you do
    hint: not have locally. This is usually caused by another repository pushing
    hint: to the same ref. You may want to first integrate the remote changes
    hint: (e.g., &#39;git pull ...&#39;) before pushing again.
    hint: See the &#39;Note about fast-forwards&#39; in &#39;git push --help&#39; for details.

I follow the instructions and `pull`, but then I receive a merge conflict. After entering a message for the merge conflict, my local code is now the incorrect code that the other developer uploaded by accident (as expected from the `pull`). So I replace the incorrect code with the backup I copied before committing, and when I try to push again, I get the same error. 

It is really frustrating, I really want to help out my team and contribute, but I can&#39;t because of this error. Does anyone know how to solve this issue? I would very much appreciate any help.

These are the commands I run in order to commit if it helps anyone out:

    git pull remotename master:dev
    git add --all
    git commit -m &quot;some message&quot;
    git pull remotename master:dev
    git push remotename master:dev

I would have thought that if I kept this order, I would not receive merge conflicts. I guess I was wrong. Thanks again

Update:
I should add that I have looked for a few hours on Google and StackOverflow, and followed different instructions, but I still can&#39;t `push` to the `dev` branch.

Updates were rejected because the remote contains work that you do not have locally

I&#39;m trying to get TravisCI to automatically deploy my Hakyll static site, according to [this guide][1].

Here&#39;s how my repo is set up. I have my source branch, which contains my hakyll and markdown files. It builds the html into the `_site` directory, which is set up as a submodule, linked to my `master` branch.

I build the site without problem, then `cd` into the _site directory. However, when I try to `git add ./*` the newly generated HTML files, I get the following error:

    fatal: Pathspec &#39;./about.html&#39; is in submodule &#39;_site&#39;

When I try `git add --all`, I get this error:

    git: pathspec.c:317: prefix_pathspec: Assertion `item-&gt;nowildcard_len &lt;= item-&gt;len &amp;&amp; item-&gt;prefix &lt;= item-&gt;len&#39; failed.
    
    /home/travis/build.sh: line 245: 1566 Aborted git add --all

What is causing this, and how can I avoid this?

You can view the repository [here](https://github.com/JoeyEremondi/JoeyEremondi.github.io/tree/source).


  [1]: http://timbaumann.info/posts/2013-08-04-hakyll-github-and-travis.html

Git: fatal: Pathspec is in submodule

I have a repository called `Generic`, which is a generic application. I have forked it into a repository called `Acme`, which just builds upon the application stored `Generic` repository and adds Acme Co branding to it.

If I make changes to the core functionality in `Generic`, I want to update the `Acme` repository with the latest changes I have made to the core functionality in `Generic`. How would I do that?

As far as I can tell, I am essentially trying to merge the changes made in an upstream repository into the current fork.

If it means anything, I&#39;m trying to do this because I have a generic application that I then build upon and brand for individual clients (like `Acme` in this example). If there is a cleaner way of doing this, let me know.

Git pull from another repository

I make new branch from `master` with: 

    git checkout -b testbranch

I make 20 commits into it.

Now I want to squash those 20 commits. I do that with:

    git rebase -i HEAD~20

What about if I don&#39;t know how many commits? Is there any way to do something like:

    git rebase -i all on this branch

Git: How to squash all commits on branch

I have now switched to Android Studio and saving my projects in Git with Source Tree. Whenever I add or remove any library from my module, its .iml file also changes. It really doesn&#39;t matter if I commit the *.iml because they get auto-generated in others Android Studio. However, [here
][1] it says you should store *.iml . My question is, do we really need to share our *.iml with others? If yes, why?


  [1]: http://devnet.jetbrains.com/docs/DOC-1186 

Is it mandatory to save *.iml files in Version control?

Is there a way to resolve conflict for all files using checkout `--ours` and `--theirs`? I know that you can do it for individual files but couldn&#39;t find a way to do it for all.

Git resolve conflict using --ours/--theirs for all files

I&#39;m using [SourceTree](http://www.sourcetreeapp.com/) as my git tool on Windows.

I have a *main* branch and a *feature* branch and I can&#39;t get SourceTree to perform a rebase when I have a conflict.

*main* looks like:
&gt;c1 -&gt; c2 -&gt; c4 -&gt; c5

*feature* looks like:
&gt;c1-&gt; c2 -&gt; c3

I want to rebase *feature* so it will be:
&gt;c1 -&gt; c2-&gt; c4-&gt; c5-&gt; c3

There is a conflict between *c3* and *c5*.  I can resolve the conflict, but when I commit the changes I get a *HEAD* tag and looking at my graph I can see that *feature* branch wasn&#39;t rebased.  

How can I get the rebase to work?




Using Source Tree, rebase with conflict, rebase doesn&#39;t work after conflict resovled

When I try to pull in my project directory in the terminal, I see the following error:

    harsukh@harsukh-desktop:~/Sites/branch1$ git pull origin master
    U app/config/app.php
    U app/config/database.php
    U app/routes.php
    Pull is not possible because you have unmerged files.
    Please, fix them up in the work tree, and then use &#39;git add/rm &lt;file&gt;&#39;
    as appropriate to mark resolution, or use &#39;git commit -a&#39;.

Why does git say `&quot;Pull is not possible because you have unmerged files&quot;`, and how can I resolve it?

Why does git say &quot;Pull is not possible because you have unmerged files&quot;?

I&#39;ve created pull request I got into this:

[![enter image description here][1]][1]

&quot;Approve&quot; button does nothing and complete is disabled.

How do I resolve this confligt in pull request?

  [1]: https://i.stack.imgur.com/7KKqE.png

Content Type	Original Author	Original Content on Stackoverflow
Question	valerie	View Question on Stackoverflow
Solution 1 - Visual Studio	DaveShaw	View Answer on Stackoverflow
Solution 2 - Visual Studio	sergiol	View Answer on Stackoverflow
Solution 3 - Visual Studio	Software Is awesome	View Answer on Stackoverflow

How to get Visual Studio to open Resolve Conflicts window after a TFS Get

Visual Studio Problem Overview

Visual Studio Solutions

Solution 1 - Visual Studio

Solution 2 - Visual Studio

Solution 3 - Visual Studio

Error: You need to include some adapter that implements karma.start method

How to change the default message of the required field in the popover of form-control in bootstrap?

Attributions