[Bug] Update failed. becasue of git conflict. how can i solve it

[mnnna]

Bug Report

Current Behavior

Expected Behavior

Additional context/output

Possible Solution

System details

Windows version: [e.g. 7, 8, 10, 11]

Windows 11

OS architecture: [e.g. 32bit, 64bit, arm64]

64bit

PowerShell version: [output of "$($PSVersionTable.PSVersion)"]

5.1

Additional software: [(optional) e.g. ConEmu, Git]

Scoop Configuration

//# Your configuration here

[rashil2000]

Can you cd into the Scoop directory (~\scoop\apps\scoop\current) and check git status there?