Source Control

Questions 1 to 5 of 6

1. 1. You edited app.py and want one commit that holds only that change. Put these steps in order.

   Use the arrows to put the steps in order.

   1. 1.Click the + button to stage app.py↑↓
   2. 2.Type a message and click Commit↑↓
   3. 3.Click the file in the Changes group to read the diff↑↓
   4. 4.Edit app.py and save it with Ctrl+S↑↓
2. 2. The terminal prints M app.py, with a space before the M. What does that mean?

   The change is staged and will go into the next commitThe file is new and Git does not track it yetThe change is in the working tree but not stagedThe file was deleted from the project
3. 3. True or false: saving a file in the editor puts that change into the next commit.

   False, because saving only changes the working tree, and the change joins a commit only after it is stagedTrue, because the panel adds every saved file to the next commit automatically
4. 4. You staged README.md by mistake. You want to keep your edits and take the file out of the next commit. What do you do?

   Press Commit with an empty messageRun git merge --abort in the terminalClick Discard Changes on the fileClick the - button next to the file in Staged Changes
5. 5. A merge stopped with a conflict in notes.md. Put the steps that finish the merge in order.

   Use the arrows to put the steps in order.

   1. 1.Search the file for <<<<<<< to confirm no markers are left↑↓
   2. 2.Type a message, or keep Git's default, and click Commit↑↓
   3. 3.Click + next to notes.md to stage it↑↓
   4. 4.Replace each conflict block with the text you want, and delete the marker lines↑↓