The moment I switched to repo1 Git started noticing the changed files. Then colleague of mine observed it as independent pair of eyes and brought this thing to my notice that I was in wrong but very similar looking repository. x so WinMerge just closes if the files are the same. This is the result: mergetool prompt false keepBackup false keepTemporaries false merge tool winmerge mergetool 'winmerge' name WinMerge trustExitCode true cmd '/c/Program\ Files/WinMerge/WinMergeU. for the extension, and the following for the arguments: /e because I like to close things with escape. And lastly, the options for mergetool are improved. Nothing to commit, working directory cleanįor half an hour. That’s the WinMergeU.exe file in WinMerge’s install directory for the command. So, I just kept running command git status on repo1 and it kept giving the same message So without realizing I modified an exactly same named file in repo2 which I was supposed to change in repo1. Now the thing is that as a standard guideline, the directory structure of source code of all the products is exactly the same in my company. These two repositories are essentially the repositories of two products I work off and on in my company. My story is bit funny but I thought it can happen with someone who might be having a similar scenario so sharing it here.Īctually on my machine, I had two separate git repositories repo1 and repo2 configured in the same root directory named source. TL DR Are you even on the correct repository?

Visual studio 2015 .git winmerge