I am having issues with my git on a windows machine. I always have some git files that are modified in every repo, the files that show as modified are same.
If I clone
Just posting it as a answer here because it might help someone else.
If you have Cygwin and Tortoise Git installed, then it will simply show many files when you try to merge the code with 0 lines added and 0 lines removed which is kind of irritating.
I tried adding the above options in git config but it did not help.
You can simply right click on any folder go to
Tortoise Settings -> General -> Rerun First Time Wizard
Now here you can change the path to git.exe by pointing to other Git.exe or if you have Gitbash installed you can point to its git.exe also. Just make sure the already existing path should be something from Cygwin/bin/git.exe which should be updated to other git.exe.