arnaud
/
trainings
1
0
Fork 0
Code

Add conflict

This commit is contained in:
Arnaud Morin 2022-01-13 14:43:28 +01:00
parent 6e02a329ca
commit 7943af3d11
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
git/trainings/1-git-conflict.md → git/training/1-git-conflict.md
View File

3
index.html
View File

@ -26,7 +26,8 @@
<p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/git/' target='_blank'>Cours</a></p> <p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/git/' target='_blank'>Cours</a></p>
<p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/git/Arnaud%20Morin%20-%20Git%20Cheat%20Sheet.pdf' target='_blank'>Cheat Sheet</a></p> <p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/git/Arnaud%20Morin%20-%20Git%20Cheat%20Sheet.pdf' target='_blank'>Cheat Sheet</a></p>
<p><a class="btn btn-primary btn-lg" href='https://github.com/jlord/git-it-electron/releases' target='_blank'>TP1 - Git-it</a></p> <p><a class="btn btn-primary btn-lg" href='https://github.com/jlord/git-it-electron/releases' target='_blank'>TP1 - Git-it</a></p>
<p>(<a class="btn btn-primary btn-lg" href='https://learngitbranching.js.org/' target='_blank'>Optional TP2 - Learn Git Branching</a>)</p> <p><a class="btn btn-primary btn-lg" href='https://learngitbranching.js.org/' target='_blank'>TP2 - Learn Git Branching</a></p>
<p><a class="btn btn-primary btn-lg" href='https://github.com/arnaudmorin/trainings/tree/main/git/training/' target='_blank'>TP3 - Git conflicts</a></p>
<h1>Docker</h1> <h1>Docker</h1>
<p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/docker/slides/' target='_blank'>Cours</a></p> <p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/docker/slides/' target='_blank'>Cours</a></p>