From 480fa370793cdf114dcca68fbd71571d58323b57 Mon Sep 17 00:00:00 2001
From: Carine <carine.rey@ens-lyon.fr>
Date: Tue, 13 Feb 2024 14:06:39 +0100
Subject: [PATCH] add tuto

---
 index.qmd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.qmd b/index.qmd
index 3a35047..73a5bf4 100755
--- a/index.qmd
+++ b/index.qmd
@@ -424,6 +424,7 @@ Import scripts of your own project on gitlab.
 Some resources to resolve conflicts:
 
  - https://docs.gitlab.com/ee/user/project/merge_requests/conflicts.html
+ - https://hbctraining.github.io/versioning_data_scripts/04_Managing_conflicts.html
  - https://www.simplilearn.com/tutorials/git-tutorial/merge-conflicts-in-git
 
 
-- 
GitLab