[Gambas-user] Distributed version control with Git in the IDE

[Benoît Minisini]

Le 27/10/2019 à 20:19, Christof Thalhofer a écrit :
> 
> There is no "internal" version control in the IDE. If the project you
> work on is already versioned by Git, the IDE can be used to pull, commit
> and push. But if there is a merge conflict or you want to use other Git
> commands like "rebase" you still have to use the commandline.
> 

Actually the IDE has an interface for managing merge conflicts (where 
you can graphically choose which part of each conflict to keep). The 
only problem is when there is a conflic in the configuration file 
('.project' and '.startup'), i.e. incompatible changes in version number 
or startup class. You have to solve them manually at the moment.

Regards,

-- 
Benoît Minisini