Talend Git hub conflict

[AbiJeev]

Hi ,

We have been recently started using Git hub repository and yesterday i have modified some of the code and imported few items but when i open today Am getting below error, while opening itself. The commit option is not able due to conflict issue . I want to resolve the conflict issue and commit the changes i have done yesterday as i dont want to give reset to lose all my changes. Am using Talend real time Big data 7.3.1 version.

[spanchal]

This error coming from Git when Studio has started seems from inconsistencies in the Git Repository that need to be cleaned up.

You can clear the Studio cache by following the below steps;

1) Stop Studio.

2) Clear studio cache as mentioned below:

3) Delete the below directories:

studio/configuration/delete org.eclipse.core.runtime and org.eclipse.equinox Folders.

(Note: Make sure to take a backup before deleting these folders.)

4) Restart the studio.

5) You can try to log in to your studio by creating a new workspace.

Please refer to the below help documentation for Handling uncommitted items when prompted (Git only);

https://help.talend.com/r/9TuKg6zZZmEHit1Ntl3pOw/73Pkuq4DMoh~11OfxctEsA

[Claude1]

Anyone got a thought?

My Estub Login