Skip to content
Snippets Groups Projects
Commit 480fa370 authored by Carine Rey's avatar Carine Rey
Browse files

add tuto

parent 1027fa37
No related branches found
No related tags found
No related merge requests found
Pipeline #1587 passed
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
index.qmd
+ 1
− 0
View file @ 480fa370
...@@ -424,6 +424,7 @@ Import scripts of your own project on gitlab. ...@@ -424,6 +424,7 @@ Import scripts of your own project on gitlab.
Some resources to resolve conflicts: Some resources to resolve conflicts:
- https://docs.gitlab.com/ee/user/project/merge_requests/conflicts.html - 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 - https://www.simplilearn.com/tutorials/git-tutorial/merge-conflicts-in-git
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment