From 02f3843183bf1293d88293c98d78665d71ddadc4 Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Mon, 10 Dec 2018 09:09:26 +0100
Subject: [PATCH] =?UTF-8?q?Commentaires=20pour=20les=20futures=20am=C3=A9l?=
 =?UTF-8?q?iorations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gitmain.tex | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gitmain.tex b/gitmain.tex
index a50f9ca..29fa732 100644
--- a/gitmain.tex
+++ b/gitmain.tex
@@ -41,4 +41,10 @@
 \include{config}
 \include{moregit}
 
+% 2 points importants d'évolutions : introduire les hunks et git
+% checkout !
+
+% Des outils pour résoudre les conflits :
+% https://developer.atlassian.com/blog/2015/12/tips-tools-to-solve-git-conflicts/
+
 \end{document}
-- 
GitLab