Git staging - Resolve conflict function not refreshing

[mjlorenzi]

I have been trying to carry out a commit using the Git client withing OxygenXML. I have a list of conflicts that need to be resolved before I can finish the commit. This is fine - so I proceed to use the Resolve Conflict function, but the files do not refresh their status after I resolve conflict. The waring icon remains, that the files remain in the Unstaged files window. Is there anything I can do? This seems slow and buggy. Should I use Gitbash instead?

[sorin_carbunaru]

Hi,

What version of Oxygen and Git Client do you have? I tested on my side with Oxygen 28.1 and Git Client 5.6.1 and I didn't notice any problems. Whenever I resolved a merge conflict (using my changes, using the remote changes, performing a manual merge), the list of stage/unstaged files changed.

Do you perhaps have many many uncommitted changes (let's say hundreds)? And how often does this problem happen?

For further investigations, it would be helpfu if you enabled full logging... Inside the attached ZIP, there is a logback.xml file. Copy logback.xml file in the lib folder from the Oxygeninstallation directory. Then:
1. Restart Oxygen.
2. Reproduce the problem.
3. Close Oxygen.
4. Delete the logback.xml file because it might cause performance issues if you leave it in the lib folder.

The resulting log files are located in the Desktop\oxygenLog folder. Add that folder to a ZIP and send it to us at support@oxygenxml.com.

All the best wishes,
Sorin Carbunaru
Oxygen XML Editor

logback.zip