I am using PushOk client for Source control between Github and TestStand.
So their is a workspace file, project file and sequences under project file.
Problem is when git Pull operation is done through TestStand, the newly added file does not appear under project file in TestStand workspace, whereas the same file is visible in file explorer in git repo.
I suspect this is happening because of Auto-resolve of project file.
Is there any way I can resolve the conflicts manually for project file (.tpj). For other sequences present under project, conflicts can be resolved manually.
The program used for conflict resolution is "FileDifferLauncher.exe".
Thank you in advance!
