Re: [Gambas-user] New git support in the IDE

[Benoît M. <ga...@us...>]

Le 12/10/2017 à 00:09, Tobias Boege a écrit :
> On Wed, 11 Oct 2017, Benoît Minisini via Gambas-user wrote:
>> Hi,
>>
>> I have just committed git support in 'master'.
>>
>> The whole IDE version control management has been redesigned. Now version
>> control is managed through a sub-menu in the 'Project' menu, or an
>> equivalent menu button in the main toolbar.
>>
>> Everything is done except conflict management. I must understand how it
>> works in git, and I'd like to have a file diff tool directly in the IDE, but
>> it's a big job.
>>
> 
> Just in case you forgot, there is already the Patch class in the IDE which I
> wrote for the Patch dialogs. It's not much and they don't deal with conflict
> files but they do parse "diff -u" patches like the ones "git diff" produces.
> 
> Regards,
> Tobi
> 

Yes, I know. But I'd like to have something like 'meld', that shows the 
differences side by side with colors, allowing to apply any difference 
from one side to the other.

Maybe should I be lazy, and tell the user to install 'meld', 'kdiff3' or 
any similar tool, and configure the IDE so that it uses it to merge 
conflicts...

-- 
Benoît Minisini