Git conflict

Collette Yann ycollet at freesurf.fr
Sat Mar 28 09:06:37 CET 2009

Previous message (by thread): [Scilab-Dev] Regarding the gsoc application
Next message (by thread): [Scilab-Dev] Git conflict
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hello,

Can somebody put some notes on the wiki on how to solve a conflict with 
git ?

Cheers,

YC

Previous message (by thread): [Scilab-Dev] Regarding the gsoc application
Next message (by thread): [Scilab-Dev] Git conflict
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the dev mailing list