[Scilab-Dev] Git conflict

[Rajika Kumarasiri]

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/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.scilab.org/pipermail/dev/attachments/20090329/a85e9fc7/attachment.htm>