CODEWITHSUNDEEP
gitgit-extensions
Astro
Astro

Reputation: 377

GitExtensions - It says there are conflicts but in reality there aren't

I am using gitExtensions. I have some changes in my local and until now when I opened the repo with GitExtensions it was working ok. It was displaying all the commits for that repo. Now when I open that Repo GitExtensions displays following screen and If I click on resolve button, no file conflicts appear listed.

enter image description here

UPDATE: I have discovered why GitExtensions displays that screen. After updating Visual Studio 2019 v16.11.9 to v16.11.15, git is updated to version 2.36.0.windows.1 and with this versions of Git, GitExtensions is not working and consequently showing that screen. Also for GitExtensions a simple Git fetch is not working. Previous to update Visual Studio 2019, my git version was 2.33.0.windows.2 and GitExtensions was working without problemas. So the culprit is the Git version. It seems like GitExtensions is not compatible with Git version 2.36.0.windows.1 So how to make GitExtensions work with Git version 2.36.0.windows.1????

My GitExtensions is the last version: 3.5.4.12724

This is what apperas en GitExtensions About:

Upvotes: 0

Views: 782

Answers (1)

Philippe
Philippe

Reputation: 31227

Discussed in GitExtensions github: https://github.com/gitextensions/gitextensions/issues/9979#issuecomment-1109561831

The issue is that you set a config setting 'core.usebuiltinfsmonitor' that will be deprecated.

And so git display a 'hint' in the output of a command that GitExtensions expect to be empty (to check if there are merge conflicts) and so interpret badly the output.

The good fix is to unset this setting (and use the replacing one if you wish 'core.fsmonitor')

Upvotes: 2

Related Questions