gitgit-extensions

there are unresolved merge conflict Issue

I have branch on git extensions every time I want to push code he show message that there is conflict enter image description here

but there is no conflict

enter image description here

how can I push my code?

Solution

  • I had the same problem after updating my git installation to version 2.36. Because git status showed the following hint in the command window:

    core.useBuiltinFSMonitor will be deprecated soon; use core.fsmonitor instead

    I replaced in my system wide git configuration:

    [core]
   useBuiltinFSMonitor = true

    with

    [core]
   fsmonitor = true

    and the error disapeared.

    see my comment on git Extension issue 1653