30,997
edits
FAQ Récupérer, mettre à jour les sources GIT du projet: Difference between revisions
Jump to navigation
Jump to search
FAQ Récupérer, mettre à jour les sources GIT du projet (view source)
Revision as of 15:28, 9 January 2013
, 13 years ago→Solving a conflict
| Line 154: | Line 154: | ||
</source> | </source> | ||
= | =Résoudre un conflit= | ||
If a file has been marked as "conflict" after a Pull request, open the file to edit it. | If a file has been marked as "conflict" after a Pull request, open the file to edit it. | ||
Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>". | Find string "<<<<<<<<<<", you will see part of code that is conflict between "<<<<<<<<<" and ">>>>>>>>". Edit manually code lines and remove "<<<<<<<<" and ">>>>>>>". | ||