Sorry if the question is stupid, but I’m really a new user of Visual Studio Code and Git, so I’m not at all able to manage basic issues.

The situation is as follows : I develop an app on VSC on my computer, and I use the Source Control function to sync the code on a GitHub account.

I’ve never had any issue using the basic functions : I commit my changes, and then I Sync, and then the code is on my GitHub project, and that’s fine.

Today, something very strange happens : I can not sync my last Commit, I’ve got error messages talking about unfinished merge, incoming/outgoing conflicts etc…

In the Source Control window, I see 2 different versions of my code : a so called “Incoming change” (that is basically the last changes I have comitted and synced a few days ago) and a so called “Outgoing change”, where I recognized the most recent code I have lastely commited.

I’ve tried all the suggested options (fetch, push, pull…) but nothing happens, I always get an error message saying that “A merge is unfinished – MERGE HEAD existing”.

I absolutely don’t understand what happens… who could help me ?

Thanks !