[Scilab-Dev] Git conflict

[Rajika Kumarasiri]

Yes..it is there....
http://wiki.scilab.org/GIT_documentation

-Rajika

On Sun, Mar 29, 2009 at 6:46 AM, Rajika Kumarasiri <rajikacc at gmail.com>wrote:

> May be we need to link [1] on scilab wiki.
>
> -Rajika
> [1] - http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
>
> On Sat, Mar 28, 2009 at 1:36 PM, Collette Yann <ycollet at freesurf.fr>wrote:
>
>> Hello,
>>
>> Can somebody put some notes on the wiki on how to solve a conflict with
>> git ?
>>
>> Cheers,
>>
>> YC
>>
>
>
>
> --
> http://wso2.org/
> http://llvm.org/
> http://www.osdev.org/
>



-- 
http://wso2.org/
http://llvm.org/
http://www.osdev.org/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.scilab.org/pipermail/dev/attachments/20090329/69d6179b/attachment.htm>