Git sync conflicts

PowerShell Universal
1

Hi,
I don´t know how this happened, but since one of my colleagues made changes to files from the Azure-DevOps console, the git sync isn´t working anymore.
2021-12-09 13:46:03.619 +01:00 [ERR] Failed to sync: 1 conflict prevents checkout at LibGit2Sharp.Core.Ensure.HandleError(Int32 result)
Whats the best way to resolve conflicts?
Theres a company policy, which prevents me from installing a git agent on the server directly (the server where PSU is installed) :persevere:

Product: PowerShell Universal
Version: 2.5.1
2

Hmmm PSU does not handle conflicts at all so this might be kind of sticky since you can’t install and run a git client on there.

You may have to compare the files on disk and see where the conflict lies with the remote. Once you find the conflict, fix it within the remote. Once that is done, stop the PSU service, delete the PSU repository directory (take a backup just in case) and then start the service and it will clone a fresh version of the repo without the conflict.

3

Ok, thanks for the response.
I think I need to talk to the customer to install a git client on the machine :slight_smile:

4

That would likely be easier :wink: