diff --git a/docs/assignments/week01.md b/docs/assignments/week01.md index adfa39a1e1538d706b4ad0c0618cf9ea1c74f8c6..d00b2f148ea58eefef2293611be10a96ac1ce27e 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!*