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)."
@Hadrien-lcrx commented on Thu Jan 25 2018
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 thedental
repository. Merge the changes from thealter-report-title
branch (the source) into themaster
branch (the destination)."Solution code
Alternative code
Last instructions
"Commit your changes with a log message."
Solution code
Alternative code (throws an error but passed the grader)
Screenshot
Solution code
Alternative code
Cf gh@pyrocortex.com, #83206 Cc @bakera81
@gvwilson commented on Wed May 16 2018
This belongs in the Git course, not the shell course (?).
@Hadrien-lcrx commented on Wed Jul 04 2018
@gvwilson would you have access to ZenHub to move the issue? Otherwise, maybe we should tag Yashas?