From e31ba877634a8386b2698d35af06dac03d505462 Mon Sep 17 00:00:00 2001 From: Matt Oswalt Date: Mon, 2 Mar 2020 11:33:08 -0800 Subject: [PATCH] Add button to lesson17/stage3 Signed-off-by: Matt Oswalt --- lessons/fundamentals/lesson-17-git/stage3/guide.md | 1 + 1 file changed, 1 insertion(+) diff --git a/lessons/fundamentals/lesson-17-git/stage3/guide.md b/lessons/fundamentals/lesson-17-git/stage3/guide.md index 078a7aa8..a6809dc0 100644 --- a/lessons/fundamentals/lesson-17-git/stage3/guide.md +++ b/lessons/fundamentals/lesson-17-git/stage3/guide.md @@ -170,6 +170,7 @@ Git is telling us that it still sees an unresolved state, so we need to run a ne git add interface-config.txt git commit -s -m "Resolve merge conflict, overwrite Fred's change" ``` + ## The Final Merge