[Gambas-devel] Disregard my last email

[Robert Rowe]

I'm running Gambas3 and wanted the change to the commit in my copy so 
that I can use it. Also I wanted to make certain that I didn't code 
anything that was duplicate or conflicting. I think that I figured out 
merging. I used svn merge to merge differences between trunk and 3.0-rw. 
I then resolved any conflicts and committed 3.0-rw. There actually 
weren't too many differences.

Robert Rowe

Benoit Minisini wrote:
> On dimanche 23 mars 2008, Robert Rowe wrote:
>   
>> The toolbar on the commit screen was added to the trunk. I was looking
>> at my branch. I'll need to merge the trunk changes into my branch.
>>
>> Robert Rowe
>>
>>     
>
> You don't have to merge these changes to your branches, as this is a part of 
> the IDE you don't work on.
>
> When you really need to do a merge, tell me, I will explain you how to do it.
>
> Regards,
>
>