Automatically resolved merge conflicts on push to gitea cause local changes to get lost

[Jondyr]

Steps to reproduce:

1. Create any merge conflict that will be automatically resolved by git. Example:
   1. New app, add a component to a page
   2. Push changes to gitea
   3. Alter the component in gitea (e.g. component-id)
   4. Commit changes in gitea
   5. Add a new component to the same page in studio designer
   6. Refresh and verify that both push and pull version control buttons have a notification
2. Click "upload your changes", click "validate changes"
3. A toast should appear stating that there is a conflict
4. Verify that the local changes appear in studio designer, but not in gitea
   1. the new component is visible in studio designer, and not visible in Side1.json
   2. the changes done in gitea is visible both places

Potential cause?

If a merge conflict is automatically resolved, the merge conflict resolution page will not be shown. VersionControlButtonsContext.tsx:commitAndPushChanges:L57 checks if hasMergeConflict is true on the response of a repo pull http request, which might be false in the case of an automatic merge resolution?
Maybe an aheadBy value above 0 should indicate local changes not present on remote, and allow the user to push the changes?

screenshots

Pull http request response:

Studio designer shows no local changes:

Zipfile with just local changes is empty:

Zipfile with whole repo is empty:

[wrt95]

We should do a push when the automatic merge conflict is resolved in backend 😄

[framitdavid]

Tested OK in dev, nice work! 👏