Different answers deemed correct | Chapter 4 Exercise 8

Hadrien-lcrx commented 6 years ago

In How can I merge two branches with conflicts?, different commands for the first and last instructions are deemed correct.

Suggestions

Update the commands, hints and grader if this isn't expected behavior.

First instructions

"You are in the master branch of the dental repository. Merge the changes from the alter-report-title branch (the source) into the master branch (the destination)."

Solution code

git merge --no-edit -m "Merging altered report title" alter-report-title master

Alternative code

git merge alter-report-title master

Last instructions

"Commit your changes with a log message."

Solution code

git commit -m "Reconciling"

Alternative code (throws an error but passed the grader)

git commit -m 'resolved conflict' report.txt

Screenshot

Solution code

Alternative code

Cf gh@pyrocortex.com, #83206 Cc @bakera81

gvwilson commented 6 years ago

This belongs in the Git course, not the shell course (?).

Hadrien-lcrx commented 6 years ago

@gvwilson would you have access to ZenHub to move the issue? Otherwise, maybe we should tag Yashas?

filipsch commented 6 years ago

Issue moved to datacamp/courses-intro-to-git #44 via ZenHub

datacamp-content / courses-introduction-to-shell