From 1d272b5f9699c8a51c2537f752be54af49ea2b63 Mon Sep 17 00:00:00 2001 From: Loes <l.bogers@hva.nl> Date: Thu, 26 Sep 2019 11:54:28 +0200 Subject: [PATCH] added help page link --- docs/assignments/week01.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assignments/week01.md b/docs/assignments/week01.md index adfa39a..d00b2f1 100644 --- a/docs/assignments/week01.md +++ b/docs/assignments/week01.md @@ -100,7 +100,7 @@ Yes! I had my first conflicting commit between the remote repository and my loca *my conflicting commits!* -Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay! +Then you keep the code you want to keep, delete the conflicting code plus the marker and save the file. [This support page](https://help.github.com/en/articles/resolving-a-merge-conflict-on-github) was helpful. The desktop app recognizes when the conflict is solved and allows you to commit again. Yay! *conflicting commits!* -- GitLab