Changeset 39
- Timestamp:
- 01/09/06 18:59:47 (19 years ago)
- Location:
- trunk/subversion
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/subversion/Makefile
r37 r39 8 8 FIGURES= \ 9 9 workco.fig \ 10 workupdate.fig 10 workupdate.fig \ 11 conflict.fig 11 12 12 13 IMAGES= \ -
trunk/subversion/subversion.tex
r38 r39 340 340 \end{slide} 341 341 342 \begin{slide}{Gérer les conflits} 343 \begin{figure}[htb] 344 \includegraphics*[height=0.3\textheight]{conflict} 345 \end{figure} 346 Si 2 commits sur le même fichier 347 348 \begin{itemize} 349 \item fusion automatique 350 \item conflit: 351 \begin{itemize} 352 \item \textit{svn resolved} 353 \item corriger le code 354 \item commiter 355 \end{itemize} 356 \end{itemize} 357 \end{slide} 358 342 359 \part{Autour de subversion} 343 360
Note: See TracChangeset
for help on using the changeset viewer.