[Git][gambas/gambas][master] Version control: Solving conflicts now automatically calls 'git cherry-pick...

[Benoît Minisini (@bminisini) <gitlab@xxxxxxxxxxxxx>]

Benoît Minisini pushed to branch master at Gambas / gambas


Commits:
7e807f02 by Benoît Minisini at 2025-12-16T11:28:22+01:00
Version control: Solving conflicts now automatically calls 'git cherry-pick --continue' instead of 'git commit' when a cherry-pick is pending.

[DEVELOPMENT ENVIRONMENT]
* BUG: Conflict editor: Update conflict buttons colors according to 'Application.DarkTheme'.
* NEW: Allow to open the version control editor when there are conflicts.
* BUG: Correctly switch between normal editor and conflict editor on an already opened file whose conflict status changes.
* BUG: Version control: Solving conflicts now automatically calls 'git cherry-pick --continue' instead of 'git commit' when a cherry-pick is pending.

- - - - -


5 changed files:

- app/src/gambas3/.src/Editor/Code/FConflictEditor.class
- app/src/gambas3/.src/FMain.class
- app/src/gambas3/.src/Project.module
- app/src/gambas3/.src/VersionControl/CVersionControlGit.class
- app/src/gambas3/.src/VersionControl/VersionControl.module


View it on GitLab: https://gitlab.com/gambas/gambas/-/commit/7e807f0233da3f2dde644f257abc1e8f51e2924e

-- 
View it on GitLab: https://gitlab.com/gambas/gambas/-/commit/7e807f0233da3f2dde644f257abc1e8f51e2924e
You're receiving this email because of your account on gitlab.com.