diff --git a/index.qmd b/index.qmd index 3a35047ecd719f4d8c2fe49a59786353ac2594f2..73a5bf454454a058c4b764e38863854c585f7b1a 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